- some bugfix

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

diff --git a/helm/software/lambda-delta/Makefile b/helm/software/lambda-delta/Makefile
index a6fcf6c4811aa86a59db6c07dfa723d4253b0381..9d55e62923276bfab15142976b4903b619337c88 100644 (file)
--- a/helm/software/lambda-delta/Makefile
+++ b/helm/software/lambda-delta/Makefile
@@ -10,44 +10,46 @@ 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 xml-si-crg xml-si profile
+
+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/pairis1.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
 
-include Makefile.common
+LOCALXMLS = xml/brg-si/grundlagen/ccs.ldc.xml
 
-HOME = .
+include Makefile.common
 
 INPUT = examples/grundlagen/grundlagen.aut
 
 test-si: $(MAIN).opt etc
-       @echo "  HELENA -p -u $(INPUT)"
-       $(H)./$(MAIN).opt -p -u -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
 
-hal: $(MAIN).opt etc
-       @echo "  HELENA -o -x -m $(INPUT)"
-       $(H)./$(MAIN).opt -o -x $(HOME) -m -s 1 -S 1 $(INPUT) > etc/log.txt
-
 xml-si: $(MAIN).opt etc
-       @echo "  HELENA -u -x -s 2 $(INPUT)"
-       $(H)./$(MAIN).opt -u -x $(HOME) -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 $(HOME) -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"
@@ -57,8 +59,8 @@ etc:
 
 %.ld:
        @echo "  XSLT $@"
-       $(H)mkdir -p $(LDDLDIR)/$(@D)
-       $(H)$(XSLT) -o $(LDDLDIR)/$@.html $(BASEURL) xml/ld-html.xsl xml/$@.xml
+       $(H)mkdir -p $(LOCALLDDLDIR)/$(@D)
+       $(H)$(XSLT) -o $(LOCALLDDLDIR)/$@.html $(BASEURL) xml/ld-html.xsl xml/$@.xml
 
 etc/make-html.sh xml/index.txt index:
        @echo "  GENERATE INDEXES"
@@ -72,28 +74,18 @@ html: etc/make-html.sh
 test-html:
        @$(MAKE) --no-print-directory $(XMLS:xml/%.xml=%)
 
-lddl: index
-       @echo "  GENERATE lddl.tar.bz2"
-       $(H)tar -cjf $(DOWNDIR)/lddl.tar.bz2 -X etc/exclude.txt xml
-
-install-xml: etc/make-html.sh
+install-html: etc/make-html.sh
        @echo "  INSTALL xml"
-       cp -a xml/index.txt xml/ld.dtd xml/brg-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
+       $(H)scp -r $(LOCALLDDLDIR)/* $(LDDLDIR)
 
-test-si-old: $(MAIN).opt etc
-       @echo "  HELENA -o -p -u $(INPUT)"
-       $(H)./$(MAIN).opt -o -p -u -S 3 $(O) $(INPUT) > etc/log.txt
+install-lddl: index
+       @echo "  INSTALL lddl.tar.bz2"
+       $(H)tar -cjf $(DOWNDIR)/lddl.tar.bz2 -X etc/exclude.txt xml
 
-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-dtd: xml/ld.dtd
+       @echo "  INSTALL $<"
+       $(H)scp $< $(XMLDIR) 
 
-xml-si-old: $(MAIN).opt etc
-       @echo "  HELENA -o -u -x -s 2 $(INPUT)"
-       $(H)./$(MAIN).opt -o -u -x $(HOME) -s 2 -S 1 $(INPUT) > etc/log.txt
+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)