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

diff --git a/helm/www/lambdadelta/Makefile b/helm/www/lambdadelta/Makefile
index 391b4e1f8..98fb867c7 100644
--- a/helm/www/lambdadelta/Makefile
+++ b/helm/www/lambdadelta/Makefile
@@ -1,25 +1,26 @@
 SHELL := $(shell which bash)
 H=@
 
+TAGS = up-html up-html-ix up-home html html-ix home ldw ldw-ix
+
 TAGS = www up-html up-css up-images up-download \
        lint-xml index lddl install-xml \
        test-html html install-html \
        install-jed install-bib install-2 install-1 install-coq \
        install-automath install-v install-matita \
 
-# LDURL = http://lambdadelta.info/
-LDURL = http://helm.cs.unibo.it/lambdadelta/
+LDWEBURL = http://helm.cs.unibo.it/lambdadelta/
 
 SITEDIR    = html
-ETCDIR     = etc
-DOWNDIR    = download
-XSLTDIR    = xslt
-XMLDIR     = xml
+HTMLDIR    = html/lddl
 SRCDIR     = web/home
 LDDLDIR    = web/lddl
 XHTBLDIR   = bin/xhtbl
 INDEXDIR   = bin/index
-HTMLDIR    = html/lddl
+ETCDIR     = etc
+DOWNDIR    = download
+XSLTDIR    = xslt
+XMLDIR     = xml
 JEDDIR     = $(HOME)/mps/jed
 BIBDIR     = $(HOME)/texmf/bibtex/bib
 CONTRIBDIR = $(ETCDIR)/lambdadelta
@@ -36,10 +37,12 @@ RSTATICDIR = /projects/helm/public_html/lambda-delta/static
 
 HTMLSTAMP   = $(ETCDIR)/html.stamp
 HTMLIXSTAMP = $(ETCDIR)/html_ix.stamp
+HOMESTAMP   = $(ETCDIR)/home.stamp
 LDWSTAMP    = $(ETCDIR)/ldw.stamp
 LDWIXSTAMP  = $(ETCDIR)/ldw_ix.stamp
 
 SITEMAP     = $(XSLTDIR)/sitemap.xsl
+TABLES      = $(XSLTDIR)/xhtbl.xsl
 
 SLS     = helena.sl automath.sl
 BIB     = lambdadelta.bib
@@ -80,35 +83,14 @@ ifeq ($(XSLT), xalan)
    XSLT       += -indent 2
 endif
 
-XSLT += $(XSLT_PARAM) baseurl '"$(LDURL)"' $(XSLT_PARAM) date '"$(shell date -R)"'
-
-define HTML_TEMPLATE
-   HTML_$(2)  = $$(SITEDIR)/$(2).html
-   HTMLS     += $$(HTML_$(2))
-
-   $$(HTML_$(2)): $(1) $$(XSLS) $$(LDWEB:%=$$(XSLTDIR)/%)
-	@echo "  XSLT $$(notdir $$<)"
-	$$(H)$$(XSLT) $$(XSLT_OUT) $$@ $$(XSLT_XSL) $$(XSLTDIR)/ld_web.xsl $$(XSLT_IN) $$<
-endef
-
-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)))
-
-   $(XSLS): $(TBLS) $(XHTBL)
-	@echo "  XHTBL $(XHTBLOPTS) *.tbl"
-	$(H)$(XHTBL) $(XHTBLOPTS) -b $(LDURL) -O $(XSLTDIR) $(TBLS)
-
-   $(foreach LDW,$(LDWS),$(eval $(call HTML_TEMPLATE,$(LDW),$(notdir $(LDW:%.ldw.xml=%)))))
-endif
+XSLT += $(XSLT_PARAM) baseurl '"$(LDWEBURL)"' $(XSLT_PARAM) date '"$(shell date -R)"'
 
 all:
 
 # UPDATE HTML LDDL ###########################################################
 
 $(ETCDIR)/html_lddl.tar.bz2: $(HTMLSTAMP)
-	@echo "  INSTALL html"
+	@echo "  UPDATE $(RHOMEDIR)/$(HTMLDIR)/"
 	$(H)tar -cjf $@ $(HTMLDIR)
 	$(H)scp $@ $(RHOMEDIR)/$(ETCDIR)
 	$(H)ssh $(REMOTE) "cd $(RDIR) && tar -xjf $@"
@@ -118,7 +100,7 @@ up-html: $(ETCDIR)/html_lddl.tar.bz2
 # UPDATE HTML IX LDDL ########################################################
 
 $(ETCDIR)/html_lddl_ix.tar.bz2: $(HTMLIXSTAMP)
-	@echo "  INSTALL html-ix"
+	@echo "  UPDATE $(RHOMEDIR)/$(HTMLDIR)/*/index.html"
 	$(H)tar -cjf $@ `find $(HTMLDIR) -name index.html`
 	$(H)scp $@ $(RHOMEDIR)/$(ETCDIR)
 	$(H)ssh $(REMOTE) "cd $(RDIR) && tar -xjf $@"
@@ -127,14 +109,16 @@ up-html-ix: $(ETCDIR)/html_lddl_ix.tar.bz2
 
 # UPDATE HTML HOME ###########################################################
 
-up-home:
-	@echo "  UPDATE $(RHOMEDIR)/html/"
-	$(H)scp -q html/*.html $(RHOMEDIR)/html/
+up-home: $(HOMESTAMP)
+	@echo "  UPDATE $(RHOMEDIR)/$(SITEDIR)/"
+	$(H)scp -q html/*.html $(RHOMEDIR)/$(SITEDIR)/
 
 # GENERATE HTML LDDL #########################################################
 
-$(HTMLSTAMP): $(LDWSTAMP) $(SITEMAP)
-	$(H)for LDW in `find $(LDDLDIR) -name *.ldw.xml`; do \
+$(HTMLSTAMP): LDWS = `find $(LDDLDIR) -name *.ldw.xml`
+
+$(HTMLSTAMP): $(LDWSTAMP) $(SITEMAP) $(LDWEB:%=$(XSLTDIR)/%)
+	$(H)for LDW in $(LDWS); do \
 	TMP=$${LDW/web/html};HTML=$${TMP/ldw.xml/html}; \
 	echo "  XSLT $$LDW"; \
 	mkdir -p $${HTML%/*}; \
@@ -147,8 +131,10 @@ html: $(HTMLSTAMP)
 
 # GENERATE HTML IX LDDL ######################################################
 
-$(HTMLIXSTAMP): $(LDWIXSTAMP) $(SITEMAP)
-	$(H)for LDW in `find $(LDDLDIR) -name index.ldw.xml`; do \
+$(HTMLIXSTAMP): LDWS = `find $(LDDLDIR) -name index.ldw.xml`
+
+$(HTMLIXSTAMP): $(LDWIXSTAMP) $(SITEMAP) $(LDWEB:%=$(XSLTDIR)/%)
+	$(H)for LDW in $(LDWS); do \
 	TMP=$${LDW/web/html};HTML=$${TMP/ldw.xml/html}; \
 	echo "  XSLT $$LDW"; \
 	mkdir -p $${HTML%/*}; \
@@ -160,7 +146,25 @@ html-ix: $(HTMLIXSTAMP)
 
 # GENERATE HTML HOME #########################################################
 
-home: $(HTMLS) $(TBLS) $(XHTBL)
+$(HOMESTAMP): LDWS = `find -L $(WEBDIRS) -name "*.ldw.xml"`
+
+$(HOMESTAMP): $(LDWS) $(TABLES) $(LDWEB:%=$(XSLTDIR)/%)
+	$(H)for LDW in $(LDWS); do \
+	TMP=$${LDW##*/};HTML=$${TMP/ldw.xml/html}; \
+	echo "  XSLT $$LDW"; \
+	$(XSLT) $(XSLT_OUT) $(SITEDIR)/$$HTML $(XSLT_XSL) $(XSLTDIR)/ld_web.xsl $(XSLT_IN) $$LDW; \
+	done
+	$(H)touch $@
+
+home: $(HOMESTAMP)
+
+# GENERATE XSL ###############################################################
+
+$(TABLES) $(SITEMAP): TBLS = `find -L $(WEBDIRS) -name "*.tbl"`
+
+$(TABLES) $(SITEMAP): $(TBLS) $(XHTBL)
+	@echo "  XHTBL $(XHTBLOPTS) *.tbl"
+	$(H)$(XHTBL) $(XHTBLOPTS) -b $(LDWEBURL) -O $(XSLTDIR) $(TBLS)
 
 # GENERATE LDW LDDL ##########################################################
 
@@ -253,7 +257,5 @@ up-download:
 #	@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)
-#	$(H)$(XSLT) $(XSLT_OUT) $(HTMLDIR)/$@.html $(XSLT_XSL) $(XSLTDIR)/ld_web.xsl $(XSLT_IN) $(LDDLDIR)/$@.ldw.xml
 
 .PHONY: $(TAGS)