Index: trunk/ippMonitor/Makefile.in
===================================================================
--- trunk/ippMonitor/Makefile.in	(revision 14056)
+++ trunk/ippMonitor/Makefile.in	(revision 15784)
@@ -6,86 +6,93 @@
 DEF	=	def
 RAW	=	raw
-DESTBIN =       @HTDOCS@/ippMonitor
+SCRIPTS =       scripts
+DESTBIN	=       @BINDIR@
+DESTWWW =       @HTDOCS@/ippMonitor
+
+GENERATE = $(SCRIPTS)/generate
+
+PROGRAMS = \
+$(DESTBIN)/dbadmin
 
 RAWSRC = \
-$(DESTBIN)/ipp.css \
-$(DESTBIN)/ipp.php \
-$(DESTBIN)/site.php \
-$(DESTBIN)/ipp.menu.dat \
-$(DESTBIN)/ipp.copy.dat \
-$(DESTBIN)/ipp.science.dat \
-$(DESTBIN)/ipp.detrend.dat \
-$(DESTBIN)/ipp.imfiles.dat \
-$(DESTBIN)/ipp.warp.dat \
-$(DESTBIN)/ipp.diff.dat \
-$(DESTBIN)/ipp.stack.dat \
-$(DESTBIN)/Login.php \
-$(DESTBIN)/SelectProject.php \
-$(DESTBIN)/LoadSetup.php \
-$(DESTBIN)/ScienceSteps.php \
-$(DESTBIN)/DetrendSteps.php \
-$(DESTBIN)/ImfileTables.php \
-$(DESTBIN)/WarpSteps.php \
-$(DESTBIN)/DiffSteps.php \
-$(DESTBIN)/StackSteps.php \
-$(DESTBIN)/phptest.php \
-$(DESTBIN)/getimage.php
+$(DESTWWW)/ipp.css \
+$(DESTWWW)/ipp.php \
+$(DESTWWW)/site.php \
+$(DESTWWW)/ipp.menu.dat \
+$(DESTWWW)/ipp.copy.dat \
+$(DESTWWW)/ipp.science.dat \
+$(DESTWWW)/ipp.detrend.dat \
+$(DESTWWW)/ipp.imfiles.dat \
+$(DESTWWW)/ipp.warp.dat \
+$(DESTWWW)/ipp.diff.dat \
+$(DESTWWW)/ipp.stack.dat \
+$(DESTWWW)/Login.php \
+$(DESTWWW)/SelectProject.php \
+$(DESTWWW)/LoadSetup.php \
+$(DESTWWW)/ScienceSteps.php \
+$(DESTWWW)/DetrendSteps.php \
+$(DESTWWW)/ImfileTables.php \
+$(DESTWWW)/WarpSteps.php \
+$(DESTWWW)/DiffSteps.php \
+$(DESTWWW)/StackSteps.php \
+$(DESTWWW)/phptest.php \
+$(DESTWWW)/getimage.php
 
 DEFSRC = \
-$(DESTBIN)/keptDetrendFrames.php \
-$(DESTBIN)/masterDetrendFrames.php \
-$(DESTBIN)/masterDetrendImfiles.php \
-$(DESTBIN)/detInputExp.php \
-$(DESTBIN)/detMasterFrame.php \
-$(DESTBIN)/detMasterImfile.php \
-$(DESTBIN)/detNormalizedExp.php \
-$(DESTBIN)/detNormalizedImfile.php \
-$(DESTBIN)/detNormalizedStatImfile.php \
-$(DESTBIN)/detProcessedImfile.php \
-$(DESTBIN)/detProcessedExp.php \
-$(DESTBIN)/detResidExp.php \
-$(DESTBIN)/detResidImfile.php \
-$(DESTBIN)/detRun.php \
-$(DESTBIN)/detRunSummary.php \
-$(DESTBIN)/detStackedImfile.php \
-$(DESTBIN)/newExp.php \
-$(DESTBIN)/newImfile.php \
-$(DESTBIN)/guidePendingExp.php \
-$(DESTBIN)/chipPendingExp.php \
-$(DESTBIN)/chipPendingImfile.php \
-$(DESTBIN)/chipProcessedExp.php \
-$(DESTBIN)/chipProcessedImfile.php \
-$(DESTBIN)/camPendingExp.php \
-$(DESTBIN)/camProcessedExp.php \
-$(DESTBIN)/pzPendingExp.php \
-$(DESTBIN)/pzPendingImfile.php \
-$(DESTBIN)/rawUnknownExp.php \
-$(DESTBIN)/rawDetrendExp.php \
-$(DESTBIN)/rawDetrendExp_detrend.php \
-$(DESTBIN)/rawImfile.php \
-$(DESTBIN)/rawImfile_failed.php \
-$(DESTBIN)/rawExp_failed.php \
-$(DESTBIN)/rawScienceExp.php \
-$(DESTBIN)/rawExp.php \
-$(DESTBIN)/summitExp.php \
-$(DESTBIN)/warpRun.php \
-$(DESTBIN)/warpInputExp.php \
-$(DESTBIN)/warpSkycellMap.php \
-$(DESTBIN)/warpSkyfile.php \
-$(DESTBIN)/diffRun.php \
-$(DESTBIN)/diffInputSkyfile.php \
-$(DESTBIN)/diffSkyfile.php \
-$(DESTBIN)/stackRun.php \
-$(DESTBIN)/stackInputSkyfile.php \
-$(DESTBIN)/stackSumSkyfile.php
+$(DESTWWW)/keptDetrendFrames.php \
+$(DESTWWW)/masterDetrendFrames.php \
+$(DESTWWW)/masterDetrendImfiles.php \
+$(DESTWWW)/detInputExp.php \
+$(DESTWWW)/detMasterFrame.php \
+$(DESTWWW)/detMasterImfile.php \
+$(DESTWWW)/detNormalizedExp.php \
+$(DESTWWW)/detNormalizedImfile.php \
+$(DESTWWW)/detNormalizedStatImfile.php \
+$(DESTWWW)/detProcessedImfile.php \
+$(DESTWWW)/detProcessedExp.php \
+$(DESTWWW)/detResidExp.php \
+$(DESTWWW)/detResidImfile.php \
+$(DESTWWW)/detRun.php \
+$(DESTWWW)/detRunSummary.php \
+$(DESTWWW)/detStackedImfile.php \
+$(DESTWWW)/newExp.php \
+$(DESTWWW)/newImfile.php \
+$(DESTWWW)/guidePendingExp.php \
+$(DESTWWW)/chipPendingExp.php \
+$(DESTWWW)/chipPendingImfile.php \
+$(DESTWWW)/chipProcessedExp.php \
+$(DESTWWW)/chipProcessedImfile.php \
+$(DESTWWW)/camPendingExp.php \
+$(DESTWWW)/camProcessedExp.php \
+$(DESTWWW)/pzPendingExp.php \
+$(DESTWWW)/pzPendingImfile.php \
+$(DESTWWW)/rawUnknownExp.php \
+$(DESTWWW)/rawDetrendExp.php \
+$(DESTWWW)/rawDetrendExp_detrend.php \
+$(DESTWWW)/rawImfile.php \
+$(DESTWWW)/rawImfile_failed.php \
+$(DESTWWW)/rawExp_failed.php \
+$(DESTWWW)/rawScienceExp.php \
+$(DESTWWW)/rawExp.php \
+$(DESTWWW)/summitExp.php \
+$(DESTWWW)/warpRun.php \
+$(DESTWWW)/warpInputExp.php \
+$(DESTWWW)/warpSkycellMap.php \
+$(DESTWWW)/warpSkyfile.php \
+$(DESTWWW)/diffRun.php \
+$(DESTWWW)/diffInputSkyfile.php \
+$(DESTWWW)/diffSkyfile.php \
+$(DESTWWW)/stackRun.php \
+$(DESTWWW)/stackInputSkyfile.php \
+$(DESTWWW)/stackSumSkyfile.php
 
 
 PICTURES = \
-$(DESTBIN)/PScolorlogo2.jpg \
-$(DESTBIN)/missing.png
+$(DESTWWW)/PScolorlogo2.jpg \
+$(DESTWWW)/missing.png
 
-DESTLINK = $(DESTBIN)/index.php
+DESTLINK = $(DESTWWW)/index.php
 
-php: $(RAWSRC) $(DEFSRC) $(PICTURES) $(DESTLINK)
+php: $(RAWSRC) $(DEFSRC) $(PICTURES) $(DESTLINK) $(PROGRAMS)
 
 # dependancy rules for binary code #########################
@@ -93,73 +100,54 @@
 # .PRECIOUS: $(BIN)/%.$(ARCH)
 
-$(DESTLINK): $(DESTBIN)/Login.php
+$(DESTLINK): $(DESTWWW)/Login.php
 	rm -f $@
-	ln -s $(DESTBIN)/Login.php $@
+	ln -s $(DESTWWW)/Login.php $@
 
-$(SRC)/%.php: $(DEF)/%.d $(DEF)/autocode.php ./generate
+$(SRC)/%.php: $(DEF)/%.d $(DEF)/autocode.php $(GENERATE)
 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
-	./generate $< $(DEF)/autocode.php $@
-
-# $(SRC)/%.php: $(RAW)/%.php
-# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
-# 	cp $< $@
-# 
-# $(SRC)/%.css: $(RAW)/%.css
-# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
-# 	cp $< $@
-# 
-# $(SRC)/%.dat: $(RAW)/%.dat
-# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
-# 	cp $< $@
-# 
-# $(SRC)/%.jpg: $(RAW)/%.jpg
-# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
-# 	cp $< $@
-# 
-# $(SRC)/%.png: $(RAW)/%.png
-# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
-# 	cp $< $@
-# 
-# $(SRC)/%.jpeg: $(RAW)/%.jpeg
-# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
-# 	cp $< $@
+	$(GENERATE) $< $(DEF)/autocode.php $@
 
 # generated php code is built into SRC first
-$(DESTBIN)/%.php: $(SRC)/%.php
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
-	rm -f $(DESTBIN)/$*.php || exit
-	cp $(SRC)/$*.php $(DESTBIN)/$*.php || exit
+$(DESTWWW)/%.php: $(SRC)/%.php
+	@if [ ! -d $(DESTWWW) ]; then mkdir -p $(DESTWWW) || exit; fi
+	rm -f $(DESTWWW)/$*.php || exit
+	cp $(SRC)/$*.php $(DESTWWW)/$*.php || exit
 
 # non-generated php code is copied directly
-$(DESTBIN)/%.php: $(RAW)/%.php
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
-	rm -f $(DESTBIN)/$*.php || exit
-	cp $(RAW)/$*.php $(DESTBIN)/$*.php || exit
+$(DESTWWW)/%.php: $(RAW)/%.php
+	@if [ ! -d $(DESTWWW) ]; then mkdir -p $(DESTWWW) || exit; fi
+	rm -f $(DESTWWW)/$*.php || exit
+	cp $(RAW)/$*.php $(DESTWWW)/$*.php || exit
 
 # all other files are copied directly
-$(DESTBIN)/%.css: $(RAW)/%.css
+$(DESTWWW)/%.css: $(RAW)/%.css
+	@if [ ! -d $(DESTWWW) ]; then mkdir -p $(DESTWWW) || exit; fi
+	rm -f $(DESTWWW)/$*.css || exit
+	cp $(RAW)/$*.css $(DESTWWW)/$*.css || exit
+
+$(DESTWWW)/%.dat: $(RAW)/%.dat
+	@if [ ! -d $(DESTWWW) ]; then mkdir -p $(DESTWWW) || exit; fi
+	rm -f $(DESTWWW)/$*.dat || exit
+	cp $(RAW)/$*.dat $(DESTWWW)/$*.dat || exit
+
+$(DESTWWW)/%.jpg: $(RAW)/%.jpg
+	@if [ ! -d $(DESTWWW) ]; then mkdir -p $(DESTWWW) || exit; fi
+	rm -f $(DESTWWW)/$*.jpg || exit
+	cp $(RAW)/$*.jpg $(DESTWWW)/$*.jpg || exit
+
+$(DESTWWW)/%.jpeg: $(RAW)/%.jpeg
+	@if [ ! -d $(DESTWWW) ]; then mkdir -p $(DESTWWW) || exit; fi
+	rm -f $(DESTWWW)/$*.jpeg || exit
+	cp $(RAW)/$*.jpeg $(DESTWWW)/$*.jpeg || exit
+
+$(DESTWWW)/%.png: $(RAW)/%.png
+	@if [ ! -d $(DESTWWW) ]; then mkdir -p $(DESTWWW) || exit; fi
+	rm -f $(DESTWWW)/$*.png || exit
+	cp $(RAW)/$*.png $(DESTWWW)/$*.png || exit
+
+$(DESTBIN)/%: $(SCRIPTS)/%
 	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
-	rm -f $(DESTBIN)/$*.css || exit
-	cp $(RAW)/$*.css $(DESTBIN)/$*.css || exit
-
-$(DESTBIN)/%.dat: $(RAW)/%.dat
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
-	rm -f $(DESTBIN)/$*.dat || exit
-	cp $(RAW)/$*.dat $(DESTBIN)/$*.dat || exit
-
-$(DESTBIN)/%.jpg: $(RAW)/%.jpg
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
-	rm -f $(DESTBIN)/$*.jpg || exit
-	cp $(RAW)/$*.jpg $(DESTBIN)/$*.jpg || exit
-
-$(DESTBIN)/%.jpeg: $(RAW)/%.jpeg
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
-	rm -f $(DESTBIN)/$*.jpeg || exit
-	cp $(RAW)/$*.jpeg $(DESTBIN)/$*.jpeg || exit
-
-$(DESTBIN)/%.png: $(RAW)/%.png
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
-	rm -f $(DESTBIN)/$*.png || exit
-	cp $(RAW)/$*.png $(DESTBIN)/$*.png || exit
+	cp $(SCRIPTS)/$* $(DESTBIN)/$* || exit
+	chmod +x $(DESTBIN)/$* || exit
 
 # utilities #################################################