Changeset 37067 for branches/eam_branches/ipp-ops-20130712/dvodist/Makefile.in

Timestamp:

Jul 17, 2014, 12:32:26 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) into trunk

File:

• branches/eam_branches/ipp-ops-20130712/dvodist/Makefile.in (modified) (8 diffs)

branches/eam_branches/ipp-ops-20130712/dvodist/Makefile.in

@@ -1 +1 @@
 default: help
 help:
-        @echo "USAGE: make (website)"
-        @echo "  (website) = dvodist or ippdata"
+        @echo "USAGE: make (target)"
+        @echo "  targets: "
+        @echo "  dvodist : the internal dvo distribution website (info pages only)"
+        @echo "  dvodist-all : install pages for dvo data"
+        @echo "  ippdata : the public ipp data distribution website"
+        @echo ""
+        @echo "  clean-dvodist : remove generated php files"
+        @echo "  clean-ippdata : remove generated php files"
 
 GENERATE = src/generate --htdocs @HTDOCS@ --rootdir @ROOTDIR@ --rootwww @ROOTWWW@
@@ -20 +26 @@
 TGT-IPPDATA = @HTDOCS@/ippdata
 
-# common code used by all installation?
+# generated common code used by all installations
 UTIL = \
-$(TGT-UTIL)/blank.html \
 $(TGT-UTIL)/ipp.page.php \
-$(TGT-UTIL)/ipp.menu.dat \
 $(TGT-UTIL)/ipp.php \
 $(TGT-UTIL)/markdown.php \
 $(TGT-UTIL)/phptest.php
 
-DVODIST = \
-$(TGT-UTIL)/dvodist.menu.dat \
+# pages which are generated (and thus depend on the config)
+DVODIST-MKD = \
 $(TGT-UTIL)/dvodist.page.php \
-$(TGT-DVODIST)/PScolorlogo2.jpg \
 $(TGT-DVODIST)/index.php \
 $(TGT-DVODIST)/test.php \
 $(TGT-DVODIST)/docs.php \
 $(TGT-DVODIST)/help.php \
-$(TGT-DVODIST)/ipp.css \
 $(TGT-DVODIST)/catdir.syn.test/index.php \
 $(TGT-DVODIST)/catdir.syn.test/n3000/index.php \
 $(TGT-DVODIST)/catdir.syn.test/n3730/index.php
 
-IPPDATA = \
-$(TGT-UTIL)/ippdata.menu.dat \
+# pages which are copied directly
+DVODIST-RAW = \
+$(TGT-DVODIST)/blank.html \
+$(TGT-DVODIST)/PScolorlogo2.jpg \
+$(TGT-DVODIST)/ipp.css \
+$(TGT-UTIL)/dvodist.menu.dat 
+
+DVODIST = $(DVODIST-MKD) $(DVODIST-RAW) 
+
+IPPDATA-MKD = \
 $(TGT-UTIL)/ippdata.page.php \
-$(TGT-IPPDATA)/PScolorlogo2.jpg \
 $(TGT-IPPDATA)/index.php \
 $(TGT-IPPDATA)/docs/index.php \
 $(TGT-IPPDATA)/docs/photladder.php \
+$(TGT-IPPDATA)/photladder.20130107.subset/index.php \
+$(TGT-IPPDATA)/photladder.20130107.subset/relphot-fits/index.php \
+$(TGT-IPPDATA)/photladder.20130107.subset/relphot-csv/index.php \
+$(TGT-IPPDATA)/photladder.20130107.subset/ubercal-fits/index.php \
+$(TGT-IPPDATA)/photladder.20130107.subset/ubercal-csv/index.php \
+$(TGT-IPPDATA)/ps1.filters/index.php \
+$(TGT-IPPDATA)/catdir.syn.test/index.php \
+$(TGT-IPPDATA)/catdir.syn.test/n3000/index.php \
+$(TGT-IPPDATA)/catdir.syn.test/n3730/index.php \
+$(TGT-IPPDATA)/help.php
+
+IPPDATA-RAW = \
+$(TGT-UTIL)/ippdata.menu.dat \
+$(TGT-IPPDATA)/blank.html \
+$(TGT-IPPDATA)/ipp.css \
+$(TGT-IPPDATA)/PScolorlogo2.jpg \
+$(TGT-IPPDATA)/ps1.filters/apj425122t3_mrt.txt \
 $(TGT-IPPDATA)/docs/photladder-1206.20130301.pdf \
 $(TGT-IPPDATA)/docs/2mass.compare/dH.allsky.20120528.v3.png \
@@ -57 +83 @@
 $(TGT-IPPDATA)/docs/2mass.compare/sigma.g.ubercal.20120528.v0.png \
 $(TGT-IPPDATA)/docs/2mass.compare/sigma.i.ubercal.20120528.v0.png \
-$(TGT-IPPDATA)/photladder.20130107.subset/index.php \
-$(TGT-IPPDATA)/photladder.20130107.subset/relphot-fits/index.php \
-$(TGT-IPPDATA)/photladder.20130107.subset/relphot-csv/index.php \
-$(TGT-IPPDATA)/photladder.20130107.subset/ubercal-fits/index.php \
-$(TGT-IPPDATA)/photladder.20130107.subset/ubercal-csv/index.php \
-$(TGT-IPPDATA)/catdir.syn.test/index.php \
-$(TGT-IPPDATA)/catdir.syn.test/n3000/index.php \
-$(TGT-IPPDATA)/catdir.syn.test/n3730/index.php \
-$(TGT-IPPDATA)/help.php \
 $(TGT-IPPDATA)/ipp.css
+
+IPPDATA = $(IPPDATA-RAW) $(IPPDATA-MKD)
 
 include $(SRC-DVODIST)/3pi.20120509/Makefile
@@ -72 +91 @@
 include $(SRC-DVODIST)/3pi.20120606/Makefile
 include $(SRC-DVODIST)/3pi.20130227/Makefile
+include $(SRC-DVODIST)/3pi.20140621/Makefile
+include $(SRC-DVODIST)/LAP.3pi.PV1/Makefile
 include $(SRC-DVODIST)/3pi.20120525.tables/Makefile
 include $(SRC-DVODIST)/3pi.20130227.tables/Makefile
@@ -81 +102 @@
 $(DIST-3pi-20120606) \
 $(DIST-3pi-20130227) \
+$(DIST-3pi-20140621) \
+$(DIST-LAP-3pi-PV1) \
 $(DIST-3pi-20120525-tables) \
 $(DIST-3pi-20130227-tables) \
@@ -96 +119 @@
         $(GENERATE) $(SRC-UTIL)/$*.mkd $(TGT-UTIL)/$*.php || exit
 
+# non-generated common utilities (not dest for htdocs)
 $(TGT-UTIL)/%: $(SRC-UTIL)/%
         @if [ ! -d $(TGT-UTIL) ]; then mkdir -p $(TGT-UTIL) || exit; fi
         cp $(SRC-UTIL)/$* $(TGT-UTIL)/$* || exit
         chmod +x $(TGT-UTIL)/$* || exit
+
+#### dvodist
+
+# common non-generated code from a common location
+$(TGT-DVODIST)/%: $(SRC-UTIL)/%
+        @if [ ! -d $(TGT-DVODIST) ]; then mkdir -p $(TGT-DVODIST) || exit; fi
+        cp $(SRC-UTIL)/$* $(TGT-DVODIST)/$* || exit
+        chmod +x $(TGT-DVODIST)/$* || exit
 
 # mkd files are used to generate php files
@@ -112 +144 @@
         cp $(SRC-DVODIST)/$* $(TGT-DVODIST)/$* || exit
         chmod +x $(TGT-DVODIST)/$* || exit
+
+#### ippdata
+
+# common non-generated code from a common location
+$(TGT-IPPDATA)/%: $(SRC-UTIL)/%
+        @if [ ! -d $(TGT-IPPDATA) ]; then mkdir -p $(TGT-IPPDATA) || exit; fi
+        cp $(SRC-UTIL)/$* $(TGT-IPPDATA)/$* || exit
+        chmod +x $(TGT-IPPDATA)/$* || exit
 
 # mkd files are used to generate php files
@@ -126 +166 @@
 
 # utilities #################################################
+clean-dvodist:  
+        rm -f $(DVODIST-MKD) $(UTIL-MKD) $(DVODIST_DIRS)
+
+clean-ippdata:  
+        rm -f $(IPPDATA-MKD) $(UTIL-MKD)
+
 clean:  
         rm -f `find . -name "*.o"`