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

diff --git a/helm/www/lambdadelta/Makefile b/helm/www/lambdadelta/Makefile
index 51ecbd1a5..df4a4b519 100644
--- a/helm/www/lambdadelta/Makefile
+++ b/helm/www/lambdadelta/Makefile
@@ -1,3 +1,4 @@
+SHELL := $(shell which bash)
 H=@
 
 TAGS = www up-html up-css up-images up-download \
@@ -17,6 +18,7 @@ XMLDIR     = xml
 SRCDIR     = web/home
 LDDLDIR    = web/lddl
 XHTBLDIR   = bin/xhtbl
+INDEXDIR   = bin/index
 HTMLDIR    = html/lddl
 JEDDIR     = $(HOME)/mps/jed
 BIBDIR     = $(HOME)/texmf/bibtex/bib
@@ -32,6 +34,9 @@ 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
+
 SLS     = helena.sl automath.sl
 BIB     = lambdadelta.bib
 CONTRIB = lambdadelta_2.tar.gz
@@ -52,6 +57,7 @@ MATITA = matita/root matita/grundlagen_2.ma
 XMLLINT = xmllint --noout
 XSLT    = xsltproc
 XHTBL   = $(XHTBLDIR)/xhtbl.native
+INDEX   = $(INDEXDIR)/index.native
 
 XHTBLOPTS =
 
@@ -94,7 +100,6 @@ ifeq ($(MAKECMDGOALS), www)
 endif
 
 all:
-	@echo $(HTMLS)
 
 www: $(HTMLS) $(TBLS) $(XHTBL)
 
@@ -121,13 +126,45 @@ test-html:
 
 html: $(ETCDIR)/make_html.sh
 	@echo "  MAKE */*.ld"
-	$(H). $<
+#	$(H). $<
+	$(H)$(INDEX) -i $(LDDLDIR) -o $(HTMLDIR) .
+
+test: $(DLHTMLIXSTAMP)
+
+$(DLHTMLSTAMP):
+	$(H)for LDW in `find $(LDDLDIR) -name *.ldw.xml`; do \
+	TMP=$${LDW/web/html};HTML=$${TMP/ldw.xml/html}; \
+	echo "  XSLT $$LDW"; \
+	mkdir -p $${HTML%/*}; \
+	$(XSLT) $(XSLT_OUT) $$HTML $(XSLT_XSL) $(XSLTDIR)/ld_web.xsl $(XSLT_IN) $$LDW; \
+	done
+	$(H)touch $@
+	$(H)touch $(DLHTMLIXSTAMP)
+
+$(DLHTMLIXSTAMP):
+	$(H)for LDW in `find $(LDDLDIR) -name index.ldw.xml`; do \
+	TMP=$${LDW/web/html};HTML=$${TMP/ldw.xml/html}; \
+	echo "  XSLT $$LDW"; \
+	mkdir -p $${HTML%/*}; \
+	$(XSLT) $(XSLT_OUT) $$HTML $(XSLT_XSL) $(XSLTDIR)/ld_web.xsl $(XSLT_IN) $$LDW; \
+	done
+	$(H)touch $@
+
+install-html: $(ETCDIR)/html_lddl.tar.bz2
+
+$(ETCDIR)/html_lddl.tar.bz2:
+	@echo "  INSTALL html"
+	$(H)tar -cjf $@ $(HTMLDIR)
+	$(H)scp $@ $(RHOMEDIR)/$(ETCDIR)
+	$(H)ssh $(REMOTE) "cd $(RDIR) && tar -xjf $@"
+
+install-html-ix: $(ETCDIR)/html_lddl_ix.tar.bz2
 
-install-html $(DOWNDIR)/static_lddl.tar.bz2: $(ETCDIR)/exclude.txt $(ETCDIR)/make_html.sh
+$(ETCDIR)/html_lddl_ix.tar.bz2:
 	@echo "  INSTALL html"
-	$(H)tar -cjf $(DOWNDIR)/static_lddl.tar.bz2 -C static -X $< lddl
-	$(H)scp $(DOWNDIR)/static_lddl.tar.bz2 $(RDOWNDIR)
-	$(H)ssh $(REMOTE) "cd $(RSTATICDIR) && tar -xjf ../../lambdadelta/download/static_lddl.tar.bz2
+#	$(H)tar -cjf $@ `find $(HTMLDIR) -name index.html`
+	$(H)scp $@ $(RHOMEDIR)/$(ETCDIR)
+	$(H)ssh $(REMOTE) "cd $(RDIR) && tar -xjf $@"
 
 install-jed: $(SLS:%=$(JEDDIR)/%)
 	@echo "  INSTALL $(SLS)"
@@ -180,9 +217,9 @@ up-download:
 
 %.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)
-	$(H)$(XSLT) $(XSLT_OUT) $(HTMLDIR)/$@.html $(XSLT_XSL) $(XSLTDIR)/ld_web.xsl $(XSLT_IN) $(LDDLDIR)/$@.ldw.xml
+#	$(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)