X-Git-Url: http://matita.cs.unibo.it/gitweb/?p=helm.git;a=blobdiff_plain;f=helm%2Fwww%2Flambdadelta%2FMakefile;h=391b4e1f883d524907b4b3b469df35ddda1a4736;hp=df4a4b51942408d74a716fc85918d5464706eb97;hb=9a0dc83131e9695ffd4254ff5546817ca431d8c2;hpb=7bb7028a9aafcfd5c6570f4ad5ca472f19691bfc

diff --git a/helm/www/lambdadelta/Makefile b/helm/www/lambdadelta/Makefile
index df4a4b519..391b4e1f8 100644
--- a/helm/www/lambdadelta/Makefile
+++ b/helm/www/lambdadelta/Makefile
@@ -34,8 +34,12 @@ RXMLDIR  = $(RHOMEDIR)/xml
 RDOWNDIR = $(RHOMEDIR)/download
 RSTATICDIR = /projects/helm/public_html/lambda-delta/static
 
-DLHTMLSTAMP = $(ETCDIR)/lddl_html.stamp
-DLHTMLIXSTAMP = $(ETCDIR)/lddl_html_ix.stamp
+HTMLSTAMP   = $(ETCDIR)/html.stamp
+HTMLIXSTAMP = $(ETCDIR)/html_ix.stamp
+LDWSTAMP    = $(ETCDIR)/ldw.stamp
+LDWIXSTAMP  = $(ETCDIR)/ldw_ix.stamp
+
+SITEMAP     = $(XSLTDIR)/sitemap.xsl
 
 SLS     = helena.sl automath.sl
 BIB     = lambdadelta.bib
@@ -87,7 +91,7 @@ define HTML_TEMPLATE
 	$$(H)$$(XSLT) $$(XSLT_OUT) $$@ $$(XSLT_XSL) $$(XSLTDIR)/ld_web.xsl $$(XSLT_IN) $$<
 endef
 
-ifeq ($(MAKECMDGOALS), www)
+ifeq ($(MAKECMDGOALS), home)
    LDWS  = $(shell find -L $(WEBDIRS) -name "*.ldw.xml")
    TBLS  = $(shell find -L $(WEBDIRS) -name "*.tbl")
    XSLS  = $(addprefix $(XSLTDIR)/,xhtbl.xsl $(notdir $(TBLS:%.tbl=%.xsl)))
@@ -101,37 +105,35 @@ endif
 
 all:
 
-www: $(HTMLS) $(TBLS) $(XHTBL)
+# UPDATE HTML LDDL ###########################################################
 
-lint-xml: $(XMLS:%=$(XMLDIR)/%)
-	@echo XMLLINT --valid
-	$(H)$(XMLLINT) --valid $^
+$(ETCDIR)/html_lddl.tar.bz2: $(HTMLSTAMP)
+	@echo "  INSTALL html"
+	$(H)tar -cjf $@ $(HTMLDIR)
+	$(H)scp $@ $(RHOMEDIR)/$(ETCDIR)
+	$(H)ssh $(REMOTE) "cd $(RDIR) && tar -xjf $@"
 
-$(ETCDIR)/make_html.sh $(XMLDIR)/index.txt index:
-	@echo "  GENERATE INDEXES"
-	$(H)find $(XMLDIR) -name "*.ld.xml" | sed s/.xml//g | sed s/xml/ld:/g > $(XMLDIR)/index.txt
-	$(H)sed "s/^/make --no-print-directory /" $(XMLDIR)/index.txt | sed s.ld:/.. > $(ETCDIR)/make_html.sh
+up-html: $(ETCDIR)/html_lddl.tar.bz2
 
-$(DOWNDIR)/lddl.tar.bz2 lddl: $(ETCDIR)/exclude.txt $(XMLDIR)/index.txt
-	@echo "  GENERATE lddl.tar.bz2"
-	$(H)tar -cjf $(DOWNDIR)/lddl.tar.bz2 -X $< $(XMLDIR)
+# UPDATE HTML IX LDDL ########################################################
 
-install-xml: $(DOWNDIR)/lddl.tar.bz2
-	@echo "  INSTALL xml"
-	$(H)scp $^ $(RDOWNDIR)
-	$(H)ssh $(REMOTE) "cd $(RDIR) && tar -xjf download/lddl.tar.bz2"
+$(ETCDIR)/html_lddl_ix.tar.bz2: $(HTMLIXSTAMP)
+	@echo "  INSTALL html-ix"
+	$(H)tar -cjf $@ `find $(HTMLDIR) -name index.html`
+	$(H)scp $@ $(RHOMEDIR)/$(ETCDIR)
+	$(H)ssh $(REMOTE) "cd $(RDIR) && tar -xjf $@"
 
-test-html:
-	@$(MAKE) --no-print-directory $(XMLS:%.xml=%)
+up-html-ix: $(ETCDIR)/html_lddl_ix.tar.bz2
 
-html: $(ETCDIR)/make_html.sh
-	@echo "  MAKE */*.ld"
-#	$(H). $<
-	$(H)$(INDEX) -i $(LDDLDIR) -o $(HTMLDIR) .
+# UPDATE HTML HOME ###########################################################
+
+up-home:
+	@echo "  UPDATE $(RHOMEDIR)/html/"
+	$(H)scp -q html/*.html $(RHOMEDIR)/html/
 
-test: $(DLHTMLIXSTAMP)
+# GENERATE HTML LDDL #########################################################
 
-$(DLHTMLSTAMP):
+$(HTMLSTAMP): $(LDWSTAMP) $(SITEMAP)
 	$(H)for LDW in `find $(LDDLDIR) -name *.ldw.xml`; do \
 	TMP=$${LDW/web/html};HTML=$${TMP/ldw.xml/html}; \
 	echo "  XSLT $$LDW"; \
@@ -139,9 +141,13 @@ $(DLHTMLSTAMP):
 	$(XSLT) $(XSLT_OUT) $$HTML $(XSLT_XSL) $(XSLTDIR)/ld_web.xsl $(XSLT_IN) $$LDW; \
 	done
 	$(H)touch $@
-	$(H)touch $(DLHTMLIXSTAMP)
+	$(H)touch $(HTMLIXSTAMP)
+
+html: $(HTMLSTAMP)
+
+# GENERATE HTML IX LDDL ######################################################
 
-$(DLHTMLIXSTAMP):
+$(HTMLIXSTAMP): $(LDWIXSTAMP) $(SITEMAP)
 	$(H)for LDW in `find $(LDDLDIR) -name index.ldw.xml`; do \
 	TMP=$${LDW/web/html};HTML=$${TMP/ldw.xml/html}; \
 	echo "  XSLT $$LDW"; \
@@ -150,21 +156,53 @@ $(DLHTMLIXSTAMP):
 	done
 	$(H)touch $@
 
-install-html: $(ETCDIR)/html_lddl.tar.bz2
+html-ix: $(HTMLIXSTAMP)
 
-$(ETCDIR)/html_lddl.tar.bz2:
-	@echo "  INSTALL html"
-	$(H)tar -cjf $@ $(HTMLDIR)
-	$(H)scp $@ $(RHOMEDIR)/$(ETCDIR)
-	$(H)ssh $(REMOTE) "cd $(RDIR) && tar -xjf $@"
+# GENERATE HTML HOME #########################################################
 
-install-html-ix: $(ETCDIR)/html_lddl_ix.tar.bz2
+home: $(HTMLS) $(TBLS) $(XHTBL)
 
-$(ETCDIR)/html_lddl_ix.tar.bz2:
-	@echo "  INSTALL html"
-#	$(H)tar -cjf $@ `find $(HTMLDIR) -name index.html`
-	$(H)scp $@ $(RHOMEDIR)/$(ETCDIR)
-	$(H)ssh $(REMOTE) "cd $(RDIR) && tar -xjf $@"
+# GENERATE LDW LDDL ##########################################################
+
+$(LDWSTAMP):
+	$(H)touch $@
+
+ldw: $(LDWSTAMP)
+
+# GENERATE LDW IX LDDL #######################################################
+
+$(LDWIXSTAMP): $(INDEX)
+	$(H)$(INDEX) -i $(LDDLDIR) -o $(HTMLDIR) .
+	$(H)touch $@
+
+ldw-ix: $(LDWIXSTAMP)
+
+##############################################################################
+
+lint-xml: $(XMLS:%=$(XMLDIR)/%)
+	@echo XMLLINT --valid
+	$(H)$(XMLLINT) --valid $^
+
+$(ETCDIR)/make_html.sh $(XMLDIR)/index.txt index:
+	@echo "  GENERATE INDEXES"
+	$(H)find $(XMLDIR) -name "*.ld.xml" | sed s/.xml//g | sed s/xml/ld:/g > $(XMLDIR)/index.txt
+	$(H)sed "s/^/make --no-print-directory /" $(XMLDIR)/index.txt | sed s.ld:/.. > $(ETCDIR)/make_html.sh
+
+$(DOWNDIR)/lddl.tar.bz2 lddl: $(ETCDIR)/exclude.txt $(XMLDIR)/index.txt
+	@echo "  GENERATE lddl.tar.bz2"
+	$(H)tar -cjf $(DOWNDIR)/lddl.tar.bz2 -X $< $(XMLDIR)
+
+install-xml: $(DOWNDIR)/lddl.tar.bz2
+	@echo "  INSTALL xml"
+	$(H)scp $^ $(RDOWNDIR)
+	$(H)ssh $(REMOTE) "cd $(RDIR) && tar -xjf download/lddl.tar.bz2"
+
+test-html:
+	@$(MAKE) --no-print-directory $(XMLS:%.xml=%)
+
+# html: $(ETCDIR)/make_html.sh
+#	@echo "  MAKE */*.ld"
+#	$(H). $<
 
 install-jed: $(SLS:%=$(JEDDIR)/%)
 	@echo "  INSTALL $(SLS)"
@@ -199,10 +237,6 @@ install-v: $(HELENADIR)/$(COQ)
 	@echo "  INSTALL $(notdir $<)"
 	$(H)scp $< $(DOWNDIR)
 
-up-html:
-	@echo "  UPDATE $(RHOMEDIR)/html/"
-	$(H)scp -q html/*.html $(RHOMEDIR)/html/
-
 up-css:
 	@echo "  UPDATE $(RHOMEDIR)/css/"
 	$(H)scp -q -r css $(RHOMEDIR)
@@ -215,8 +249,8 @@ up-download:
 	@echo "  UPDATE $(RHOMEDIR)/download/"
 	$(H)scp -q -r download $(RHOMEDIR)
 
-%.ld:
-	@echo "  XSLT $@"
+#%.ld:
+#	@echo "  XSLT $@"
 #	$(H)mkdir -p $(LDDLDIR)/$(@D)
 #	$(H)$(XSLT) --novalid $(XSLT_OUT) $(LDDLDIR)/$@.ldw.xml $(XSLT_XSL) $(XSLTDIR)/lddl.xsl $(XSLT_IN) $(XMLDIR)/$@.xml
 #	$(H)mkdir -p $(HTMLDIR)/$(@D)