X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2FMakefile;h=dacc62f6c17f6d535c771c060d70752f03342058;hb=f7bb626faf6b9d89c0ee5ac48b1d97c69d189f8a;hp=74154e0991f516faa7a77ed7cd1284ff70c03a55;hpb=03e172581072389796cbc1d3e2d7b16956b95c8a;p=helm.git

diff --git a/helm/software/lambda-delta/Makefile b/helm/software/lambda-delta/Makefile
index 74154e099..dacc62f6c 100644
--- a/helm/software/lambda-delta/Makefile
+++ b/helm/software/lambda-delta/Makefile
@@ -4,11 +4,13 @@ REQUIRES = unix str
 
 KEEP = README automath/*.aut
 
-CLEAN = log.txt
+CLEAN = etc/log.txt
 
-TAGS = test test-si test-si-fast hal xml-si
+TAGS = test test-si test-si-fast hal xml-si-drg xml-si-old 
 
-XMLS = xml/grundlagen/l/not.ld.xml xml/grundlagen/l/con.ld.xml
+XMLS = xml/grundlagen/l/not.ld.xml xml/grundlagen/l/et.ld.xml \
+       xml/grundlagen/l/e/st/eq/landau/n/rt/rp/r/c/8283/t234.ld.xml \
+       xml/grundlagen/l/e/pairis1.ld.xml
 
 include Makefile.common
 
@@ -17,44 +19,45 @@ INPUT = automath/grundlagen.aut
 INPUT-ORIG = automath/grundlagen-orig.aut
 
 test: $(MAIN).opt
-	@echo "  HELENA -a -r $(INPUT)"
-	$(H)./$(MAIN).opt -a -r -S 3 $(O) $(INPUT) > log.txt
+	@echo "  HELENA -o -p -r $(INPUT)"
+	$(H)./$(MAIN).opt -o -p -r -S 3 $(O) $(INPUT) > etc/log.txt
 
 test-si: $(MAIN).opt
-	@echo "  HELENA -a -r -u $(INPUT)"
-	$(H)./$(MAIN).opt -a -r -u -S 3 $(O) $(INPUT) > log.txt
+	@echo "  HELENA -o -p -r -u $(INPUT)"
+	$(H)./$(MAIN).opt -o -p -r -u -S 3 $(O) $(INPUT) > etc/log.txt
 
 test-si-fast: $(MAIN).opt
-	@echo "  HELENA -r -u $(INPUT)"
-	$(H)./$(MAIN).opt -r -u -S 1 $(O) $(INPUT) > log.txt
+	@echo "  HELENA -o -r -u $(INPUT)"
+	$(H)./$(MAIN).opt -o -r -u -S 1 $(O) $(INPUT) > etc/log.txt
 
 hal: $(MAIN).opt
-	@echo "  HELENA -m $(INPUT)"
-	$(H)./$(MAIN).opt -m -s 1 -S 1 $(INPUT) > log.txt
+	@echo "  HELENA -o -x -m $(INPUT)"
+	$(H)./$(MAIN).opt -o -x -m -s 1 -S 1 $(INPUT) > etc/log.txt
 
-xml-si: $(MAIN).opt
-	@echo "  HELENA -u -x $(INPUT)"
-	$(H)./$(MAIN).opt -u -x -s 2 -S 1 $(INPUT) > log.txt
+xml-si-old: $(MAIN).opt
+	@echo "  HELENA -o -u -x -s 2 $(INPUT)"
+	$(H)./$(MAIN).opt -o -u -x -s 2 -S 1 $(INPUT) > etc/log.txt
 
-%.ld: BASEURL = --stringparam baseurl $(STATIC)
+xml-si-drg: $(MAIN).opt
+	@echo "  HELENA -u -x -s 1 $(INPUT)"
+	$(H)./$(MAIN).opt -u -x -s 1 -S 1 $(INPUT) > etc/log.txt
+
+
+%.ld: BASEURL = --stringparam baseurl $(LDDLURL)
 
 %.ld:
 	@echo "  XSLT $@"
-	$(H)mkdir -p static/$(@D)
-	$(H)$(XSLT) -o static/$@.html $(BASEURL) xml/ld-html.xsl xml/$@.xml
+	$(H)mkdir -p $(LDDLDIR)/$(@D)
+	$(H)$(XSLT) -o $(LDDLDIR)/$@.html $(BASEURL) xml/ld-html.xsl xml/$@.xml
 
-make-html.sh xml/index.txt index:
+etc/make-html.sh xml/index.txt index:
 	@echo "  GENERATING INDEXES"
 	$(H)find xml -name "*.ld.xml" | sed s/.xml//g | sed s/xml/ld:/g > xml/index.txt
-	$(H)sed "s/^/make --no-print-directory /" xml/index.txt | sed s.ld:/.. > make-html.sh
+	$(H)sed "s/^/make --no-print-directory /" xml/index.txt | sed s.ld:/.. > etc/make-html.sh
 
-html: make-html.sh
+html: etc/make-html.sh
 	@echo "  MAKE */*.ld"
 	$(H). $<
 
 test-html:
-	@$(MAKE) --no-print-directory $(XMLS:xml/%.xml=%) grundlagen/l/someapp.ld
-
-install-html:
-	@echo "  CP -r static/* /projects/helm/public_html/lambda-delta/static/"
-	$(H)cp -r static/* /projects/helm/public_html/lambda-delta/static/
+	@$(MAKE) --no-print-directory $(XMLS:xml/%.xml=%)