update in basic_2, static_2, web site

[helm.git] / helm / www / lambdadelta / Makefile

diff --git a/helm/www/lambdadelta/Makefile b/helm/www/lambdadelta/Makefile
index 2696e9ddc894f117000000308a64fe174ca47521..e9008a950c30a13b68e2dba934c0aa5991b00610 100644 (file)
--- a/helm/www/lambdadelta/Makefile
+++ b/helm/www/lambdadelta/Makefile
@@ -1,6 +1,6 @@
 H=@
 
-TAGS = www up \
+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 \
@@ -8,7 +8,7 @@ TAGS = www up \
 
 LDURL   = http://lambdadelta.info/
 
-HOMEDIR = .
+SITEDIR    = html
 ETCDIR     = etc
 DOWNDIR    = download
 XSLTDIR    = xslt
@@ -41,7 +41,7 @@ XMLS = Environment/grundlagen_2/l/not.ld.xml \
        Environment/grundlagen_2/l/e/pairis1.ld.xml \
        Environment/grundlagen_2/l/e/st/eq/landau/n/327/t25.ld.xml \
 
-LDWEB = ld_web.xsl ld_web_root.xsl ld_web_library.xsl
+LDWEB = ld_web.xsl ld_web_root.xsl ld_web_library.xsl ld_web_ebnf.xsl
 
 AUTOMATH = examples/automath/grundlagen_2.aut
 COQ      = coq/grundlagen_2.v
@@ -52,6 +52,8 @@ XMLLINT = xmllint --noout
 XSLT    = xalan
 XHTBL   = $(XHTBLDIR)/xhtbl.native
 
+XHTBLOPTS =
+
 ifeq ($(XSLT), xsltproc)
    XSLT_PARAM := --param
    XSLT_OUT   := -o
@@ -70,7 +72,7 @@ endif
 XSLT += $(XSLT_PARAM) baseurl '"$(LDURL)"' $(XSLT_PARAM) date '"$(shell date -R)"'
 
 define HTML_TEMPLATE
-   HTML_$(2)  = $$(HOMEDIR)/$(2).html
+   HTML_$(2)  = $$(SITEDIR)/$(2).html
    HTMLS     += $$(HTML_$(2))
 
    $$(HTML_$(2)): $(1) $$(XSLS) $$(LDWEB:%=$$(XSLTDIR)/%)
@@ -84,19 +86,20 @@ ifeq ($(MAKECMDGOALS), www)
    XSLS  = $(addprefix $(XSLTDIR)/,xhtbl.xsl $(notdir $(TBLS:%.tbl=%.xsl)))
 
    $(XSLS): $(TBLS) $(XHTBL)
-       @echo "  XHTBL *.tbl"
-       $(H)$(XHTBL) -b $(LDURL) -O $(XSLTDIR) $(TBLS)
+       @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
 
-all: www
+all:
+       @echo $(HTMLS)
 
 www: $(HTMLS) $(TBLS) $(XHTBL)
 
 lint-xml: $(XMLS:%=$(XMLDIR)/%)
        @echo XMLLINT --valid
-       $(H)$(XMLLINT) --valid $^ 
+       $(H)$(XMLLINT) --valid $^
 
 $(ETCDIR)/make-html.sh $(XMLDIR)/index.txt index:
        @echo "  GENERATE INDEXES"
@@ -105,9 +108,9 @@ $(ETCDIR)/make-html.sh $(XMLDIR)/index.txt index:
 
 $(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) 
+       $(H)tar -cjf $(DOWNDIR)/lddl.tar.bz2 -X $< $(XMLDIR)
 
-install-xml: $(DOWNDIR)/lddl.tar.bz2 
+install-xml: $(DOWNDIR)/lddl.tar.bz2
        @echo "  INSTALL xml"
        $(H)scp $^ $(RDOWNDIR)
        $(H)ssh $(REMOTE) "cd $(RDIR) && tar -xjf download/lddl.tar.bz2"
@@ -121,7 +124,7 @@ html: $(ETCDIR)/make_html.sh
 
 install-html $(DOWNDIR)/static_lddl.tar.bz2: $(ETCDIR)/exclude.txt $(ETCDIR)/make_html.sh
        @echo "  INSTALL html"
-       $(H)tar -cjf $(DOWNDIR)/static_lddl.tar.bz2 -C static -X $< lddl 
+       $(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
 
@@ -158,9 +161,21 @@ install-v: $(HELENADIR)/$(COQ)
        @echo "  INSTALL $(notdir $<)"
        $(H)scp $< $(DOWNDIR)
 
-up:
-       @echo "  UPDATE $(RHOMEDIR)"
-       $(H)ssh $(REMOTE) "svn up $(RDIR)"
+up-html:
+       @echo "  UPDATE $(RHOMEDIR)/html/"
+       $(H)scp -q -r html $(RHOMEDIR)
+
+up-css:
+       @echo "  UPDATE $(RHOMEDIR)/css/"
+       $(H)scp -q -r css $(RHOMEDIR)
+
+up-images:
+       @echo "  UPDATE $(RHOMEDIR)/images/"
+       $(H)scp -q -r images $(RHOMEDIR)
+
+up-download:
+       @echo "  UPDATE $(RHOMEDIR)/download/"
+       $(H)scp -q -r download $(RHOMEDIR)
 
 %.ld:
        @echo "  XSLT $@"