Changeset 35238 for trunk/dvodist/Makefile.in

Timestamp:

Mar 5, 2013, 2:34:10 PM (13 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130207

File:

• trunk/dvodist/Makefile.in (modified) (7 diffs)

trunk/dvodist/Makefile.in

@@ -4 +4 @@
         @echo "  (website) = dvodist or ippdata"
 
-GENERATE = src/generate
+GENERATE = src/generate --htdocs @HTDOCS@ --rootdir @ROOTDIR@ --rootwww @ROOTWWW@
 
 # we have 2 sites (or more?) controlled by this build directory
@@ -44 +44 @@
 $(TGT-IPPDATA)/PScolorlogo2.jpg \
 $(TGT-IPPDATA)/index.php \
+$(TGT-IPPDATA)/docs/index.php \
+$(TGT-IPPDATA)/docs/photladder.php \
+$(TGT-IPPDATA)/docs/photladder-1206.20130301.pdf \
+$(TGT-IPPDATA)/docs/2mass.compare/dH.allsky.20120528.v3.png \
+$(TGT-IPPDATA)/docs/2mass.compare/dHK.allsky.20120528.v3.png \
+$(TGT-IPPDATA)/docs/2mass.compare/dJ.allsky.20120528.v3.png \
+$(TGT-IPPDATA)/docs/2mass.compare/dJH.allsky.20120528.v3.png \
+$(TGT-IPPDATA)/docs/2mass.compare/dK.allsky.20120528.v3.png \
+$(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)/test.php \
 $(TGT-IPPDATA)/docs.php \
@@ -73 +91 @@
         @if [ ! -d $(TGT-UTIL) ]; then mkdir -p $(TGT-UTIL) || exit; fi
         rm -f $(TGT-UTIL)/$*.php || exit
-        $(GENERATE) --htdocs @HTDOCS@ --rootdir @ROOTDIR@ $(SRC-UTIL)/$*.mkd $(TGT-UTIL)/$*.php || exit
+        $(GENERATE) $(SRC-UTIL)/$*.mkd $(TGT-UTIL)/$*.php || exit
 
 $(TGT-UTIL)/%: $(SRC-UTIL)/%
@@ -84 +102 @@
         @if [ ! -d $(@D) ]; then mkdir -p $(@D) || exit; fi
         rm -f $(TGT-DVODIST)/$*.php || exit
-        $(GENERATE) --htdocs @HTDOCS@ --rootdir @ROOTDIR@ $(SRC-DVODIST)/$*.mkd $(TGT-DVODIST)/$*.php || exit
+        $(GENERATE) $(SRC-DVODIST)/$*.mkd $(TGT-DVODIST)/$*.php || exit
 
 # non-generated php code is copied directly
@@ -96 +114 @@
         @if [ ! -d $(@D) ]; then mkdir -p $(@D) || exit; fi
         rm -f $(TGT-IPPDATA)/$*.php || exit
-        $(GENERATE) --htdocs @HTDOCS@ --rootdir @ROOTDIR@ $(SRC-IPPDATA)/$*.mkd $(TGT-IPPDATA)/$*.php || exit
+        $(GENERATE) $(SRC-IPPDATA)/$*.mkd $(TGT-IPPDATA)/$*.php || exit
 
 # non-generated php code is copied directly
@@ -116 +134 @@
 .PRECIOUS: $(SRC)/%.png
 .PRECIOUS: $(SRC)/%.jpg
+.PRECIOUS: $(SRC)/%.pdf
 .PRECIOUS: $(SRC)/%.jpeg
 
@@ -127 +146 @@
 $(SRC-PROG)/mkdist.testcat.sh \
 $(SRC-PROG)/mkindex.sh
-