Syntax for coercion nocomposites fixed.

[helm.git] / helm / software / lambda-delta / Makefile

diff --git a/helm/software/lambda-delta/Makefile b/helm/software/lambda-delta/Makefile
index 03f1f1704658829affd6a132cf7d30a7d21f387f..d8aa348f4734b4c6cf602447792e5c137c27a740 100644 (file)
--- a/helm/software/lambda-delta/Makefile
+++ b/helm/software/lambda-delta/Makefile
@@ -10,46 +10,49 @@ KEEP = README
 
 CLEAN = etc/log.txt etc/profile.txt
 
-TAGS = test-si test-si-fast hal xml-si-crg xml-si profile
+TAGS = test-si test-si-fast profile xml-si xml-si-crg html test-html \
+       install-html install-lddl install-dtd install-xml instal-css
 
-XMLLINTLOCAL = --nonet --path xml --dtdvalid ld.dtd
 
 XMLS = xml/brg-si/grundlagen/l/not.ld.xml \
        xml/brg-si/grundlagen/l/et.ld.xml \
        xml/brg-si/grundlagen/l/e/st/eq/landau/n/rt/rp/r/c/8283/t234.ld.xml \
        xml/brg-si/grundlagen/l/e/pairis1.ld.xml \
+       xml/brg-si/grundlagen/l/e/st/eq/landau/n/327/t25.ld.xml \
        xml/crg-si/grundlagen/l/not.ld.xml \
        xml/crg-si/grundlagen/l/et.ld.xml \
        xml/crg-si/grundlagen/l/e/st/eq/landau/n/rt/rp/r/c/8283/t234.ld.xml \
-       xml/crg-si/grundlagen/l/e/pairis1.ld.xml
-
-LOCALXMLS = xml/brg-si/grundlagen/ccs.ldc.xml
+       xml/crg-si/grundlagen/l/e/pairis1.ld.xml \
+       xml/crg-si/grundlagen/l/e/st/eq/landau/n/327/t25.ld.xml \
+       xml/brg-si/grundlagen/ccs.ldc.xml
 
 include Makefile.common
 
 INPUT = examples/grundlagen/grundlagen.aut
 
+SLS = helena.sl automath.sl
+
 test-si: $(MAIN).opt etc
-       @echo "  HELENA -p -u -c $(INPUT)"
-       $(H)./$(MAIN).opt -p -u -c -S 3 $(O) $(INPUT) > etc/log.txt
+       @echo "  HELENA -p -o -c $(INPUT)"
+       $(H)./$(MAIN).opt -p -o -c -S 3 $(O) $(INPUT) > etc/log.txt
 
 test-si-fast: $(MAIN).opt etc
-       @echo "  HELENA -u -q $(INPUT)"
-       $(H)./$(MAIN).opt -u -q -S 1 $(O) $(INPUT) > etc/log.txt
+       @echo "  HELENA -o -q $(INPUT)"
+       $(H)./$(MAIN).opt -o -q -S 1 $(O) $(INPUT) > etc/log.txt
 
 profile: $(MAIN).opt etc
-       @echo "  HELENA -u -q $(INPUT) (30 TIMES)"
+       @echo "  HELENA -o -q $(INPUT) (30 TIMES)"
        $(H)rm etc/log.txt
-       $(H)for T in `seq 30`; do ./$(MAIN).opt -u -q -s 3 -S 1 $(O) $(INPUT) >> etc/log.txt; done
+       $(H)for T in `seq 30`; do ./$(MAIN).opt -o -q -s 3 -S 1 $(O) $(INPUT) >> etc/log.txt; done
        $(H)grep "at exit" etc/log.txt | sort | uniq > etc/profile-new.txt
 
 xml-si: $(MAIN).opt etc
-       @echo "  HELENA -u -x -s 2 $(INPUT)"
-       $(H)./$(MAIN).opt -u -x -s 2 -S 1 $(INPUT) > etc/log.txt
+       @echo "  HELENA -o -x -s 2 $(INPUT)"
+       $(H)./$(MAIN).opt -o -x -s 2 -S 1 $(INPUT) > etc/log.txt
 
 xml-si-crg: $(MAIN).opt etc
-       @echo "  HELENA -u -x -s 1 $(INPUT)"
-       $(H)./$(MAIN).opt -u -x -s 1 -S 1 $(INPUT) > etc/log.txt
+       @echo "  HELENA -o -x -s 1 $(INPUT)"
+       $(H)./$(MAIN).opt -o -x -s 1 -S 1 $(INPUT) > etc/log.txt
 
 etc:
        @echo "  MKDIR etc"
@@ -62,6 +65,9 @@ etc:
        $(H)mkdir -p $(LOCALLDDLDIR)/$(@D)
        $(H)$(XSLT) -o $(LOCALLDDLDIR)/$@.html $(BASEURL) xml/ld-html.xsl xml/$@.xml
 
+%.ldc:
+       @echo "  SKIP $@"
+
 etc/make-html.sh xml/index.txt index:
        @echo "  GENERATE INDEXES"
        $(H)find xml -name "*.ld.xml" | sed s/.xml//g | sed s/xml/ld:/g > xml/index.txt
@@ -80,30 +86,25 @@ install-html: etc/make-html.sh
 
 install-lddl: index
        @echo "  INSTALL lddl.tar.bz2"
-       $(H)tar -cjf $(DOWNDIR)/lddl.tar.bz2 -X etc/exclude.txt xml
+       $(H)tar -cjf etc/lddl.tar.bz2 -X etc/exclude.txt xml
+       $(H)scp etc/lddl.tar.bz2 $(DOWNDIR)
 
 install-dtd: xml/ld.dtd
        @echo "  INSTALL $<"
-       $(H)scp $< $(XMLDIR) 
+       $(H)scp $< $(XMLDIR)
+
+install-css: xml/ld-html.css
+       @echo "  INSTALL $<"
+       $(H)scp $< $(LDDLDIR)
 
 install-xml: etc/make-html.sh
        @echo "  INSTALL xml"
        $(H)scp -r xml/index.txt xml/ld.dtd xml/brg-si/ xml/crg-si/ $(XMLDIR)
 
-# old targets ##########################################################
-
-test: $(MAIN).opt etc
-       @echo "  HELENA -o -p $(INPUT)"
-       $(H)./$(MAIN).opt -o -p -S 3 $(O) $(INPUT) > etc/log.txt
-
-test-si-old: $(MAIN).opt etc
-       @echo "  HELENA -o -p -u -c $(INPUT)"
-       $(H)./$(MAIN).opt -o -p -u -c -S 3 $(O) $(INPUT) > etc/log.txt
-
-test-si-fast-old: $(MAIN).opt etc
-       @echo "  HELENA -o -u -q $(INPUT)"
-       $(H)./$(MAIN).opt -o -u -q -S 1 $(O) $(INPUT) > etc/log.txt
+install-icons:
+       @echo "  INSTALL *.png *.ico"
+       $(H)scp icons/*.png icons/*.ico $(DOWNDIR)
 
-xml-si-old: $(MAIN).opt etc
-       @echo "  HELENA -o -u -x -s 2 $(INPUT)"
-       $(H)./$(MAIN).opt -o -u -x -s 2 -S 1 $(INPUT) > etc/log.txt
+install-jed:
+       @echo "  INSTALL $(SLS)"
+       $(H)scp $(SLS:%=$(HOME)/jed/%) $(DOWNDIR)