Index: trunk/ippMonitor/Makefile
===================================================================
--- trunk/ippMonitor/Makefile	(revision 9003)
+++ trunk/ippMonitor/Makefile	(revision 9008)
@@ -22,11 +22,8 @@
 $(DESTBIN)/DetrendSteps.php \
 $(DESTBIN)/ImfileTables.php \
-$(DESTBIN)/phptest.php \
-$(DESTBIN)/flat_1_0.b1.jpeg \
-$(DESTBIN)/flat_1_0.b2.jpeg \
-$(DESTBIN)/pic.png
-
+$(DESTBIN)/phptest.php
 
 DEFSRC = \
+$(DESTBIN)/masterDetrendImages.php \
 $(DESTBIN)/detInputExp.php \
 $(DESTBIN)/detMasterFrame.php \
@@ -56,7 +53,30 @@
 
 PICTURES = \
-$(DESTBIN)/PScolorlogo2.jpg
+$(DESTBIN)/PScolorlogo2.jpg \
+$(DESTBIN)/flat_1_0.b1.jpeg \
+$(DESTBIN)/flat_1_0.b2.jpeg \
+$(DESTBIN)/pic.png
 
-php: $(RAWSRC) $(DEFSRC) $(PICTURES)
+DEMOPICS = \
+$(DESTBIN)/806237f.detresid.3.0.b1.jpg \
+$(DESTBIN)/806237f.detresid.3.0.b2.jpg \
+$(DESTBIN)/806238f.detresid.3.0.b1.jpg \
+$(DESTBIN)/806238f.detresid.3.0.b2.jpg \
+$(DESTBIN)/806239f.detresid.3.0.b1.jpg \
+$(DESTBIN)/806239f.detresid.3.0.b2.jpg \
+$(DESTBIN)/838749d.detresid.2.0.b1.jpg \
+$(DESTBIN)/838749d.detresid.2.0.b2.jpg \
+$(DESTBIN)/838790d.detresid.2.0.b1.jpg \
+$(DESTBIN)/838790d.detresid.2.0.b2.jpg \
+$(DESTBIN)/838791d.detresid.2.0.b1.jpg \
+$(DESTBIN)/838791d.detresid.2.0.b2.jpg \
+$(DESTBIN)/850131b.detresid.1.0.b1.jpg \
+$(DESTBIN)/850131b.detresid.1.0.b2.jpg \
+$(DESTBIN)/850132b.detresid.1.0.b1.jpg \
+$(DESTBIN)/850132b.detresid.1.0.b2.jpg \
+$(DESTBIN)/850133b.detresid.1.0.b1.jpg \
+$(DESTBIN)/850133b.detresid.1.0.b2.jpg
+
+php: $(RAWSRC) $(DEFSRC) $(PICTURES) $(DEMOPICS)
 
 # dependancy rules for binary code #########################
@@ -64,32 +84,33 @@
 # .PRECIOUS: $(BIN)/%.$(ARCH)
 
-$(SRC)/%.php: $(DEF)/%.d $(DEF)/autocode.php
+$(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)/%.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 $< $@
 
-$(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 $< $@
-
+# generated php code is built into SRC first
 $(DESTBIN)/%.php: $(SRC)/%.php
 	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
@@ -97,28 +118,35 @@
 	cp $(SRC)/$*.php $(DESTBIN)/$*.php || exit
 
-$(DESTBIN)/%.css: $(SRC)/%.css
+# 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
+
+# all other files are copied directly
+$(DESTBIN)/%.css: $(RAW)/%.css
 	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
 	rm -f $(DESTBIN)/$*.css || exit
-	cp $(SRC)/$*.css $(DESTBIN)/$*.css || exit
+	cp $(RAW)/$*.css $(DESTBIN)/$*.css || exit
 
-$(DESTBIN)/%.dat: $(SRC)/%.dat
+$(DESTBIN)/%.dat: $(RAW)/%.dat
 	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
 	rm -f $(DESTBIN)/$*.dat || exit
-	cp $(SRC)/$*.dat $(DESTBIN)/$*.dat || exit
+	cp $(RAW)/$*.dat $(DESTBIN)/$*.dat || exit
 
-$(DESTBIN)/%.jpg: $(SRC)/%.jpg
+$(DESTBIN)/%.jpg: $(RAW)/%.jpg
 	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
 	rm -f $(DESTBIN)/$*.jpg || exit
-	cp $(SRC)/$*.jpg $(DESTBIN)/$*.jpg || exit
+	cp $(RAW)/$*.jpg $(DESTBIN)/$*.jpg || exit
 
-$(DESTBIN)/%.jpeg: $(SRC)/%.jpeg
+$(DESTBIN)/%.jpeg: $(RAW)/%.jpeg
 	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
 	rm -f $(DESTBIN)/$*.jpeg || exit
-	cp $(SRC)/$*.jpeg $(DESTBIN)/$*.jpeg || exit
+	cp $(RAW)/$*.jpeg $(DESTBIN)/$*.jpeg || exit
 
-$(DESTBIN)/%.png: $(SRC)/%.png
+$(DESTBIN)/%.png: $(RAW)/%.png
 	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
 	rm -f $(DESTBIN)/$*.png || exit
-	cp $(SRC)/$*.png $(DESTBIN)/$*.png || exit
+	cp $(RAW)/$*.png $(DESTBIN)/$*.png || exit
 
 # utilities #################################################
@@ -132,3 +160,5 @@
 .PRECIOUS: $(SRC)/%.css
 .PRECIOUS: $(SRC)/%.dat
+.PRECIOUS: $(SRC)/%.png
 .PRECIOUS: $(SRC)/%.jpg
+.PRECIOUS: $(SRC)/%.jpeg