- helena: the improved attribute system allows to export the sorts of Pi's

[helm.git] / helm / software / helena / Makefile

diff --git a/helm/software/helena/Makefile b/helm/software/helena/Makefile
index ab7dc1831bd622d3195b2b2204ee7cf0ea009c67..5d359ba3922fb434e01a0dd039370abe682c669c 100644 (file)
--- a/helm/software/helena/Makefile
+++ b/helm/software/helena/Makefile
@@ -10,50 +10,54 @@ KEEP = README
 
 CLEAN = etc/log.txt etc/profile.txt
 
-TAGS = test-si test-si-fast profile xml-si xml-si-crg matita matitac 
+TAGS = test-si-fast test-si test-si-matita profile xml-si-crg xml-si matita matitac 
 
 include Makefile.common
 
-MATITAC = ../../../claudio/matita/matitac.opt
+MATITAC = ../../../../matita/matita/matitac.opt
 
-MATITA = ../../../claudio/matita/matita.opt
+MATITA = ../../../../matita/matita/matita.opt
 
 XMLDIR = ../../www/lambdadelta
 
-INPUT = examples/grundlagen/grundlagen_2.aut
+INPUT = examples/automath/grundlagen_2.aut
 
-INPUTFAST = examples/grundlagen/grundlagen_1.aut
+INPUTFAST = examples/automath/grundlagen_1.aut
 
 MA = grundlagen_2.ma
 
 PREAMBLE = ../matita/matita.ma.templ
 
-test-si $(MA): $(MAIN).opt etc
-       @echo "  HELENA -d -l -m -p -o $(INPUT)"
-       $(H)./$(MAIN).opt -T 2 -d -l -m $(PREAMBLE) -p -o $(O) $(INPUT) > etc/log.txt
-
 test-si-fast: $(MAIN).opt etc
        @echo "  HELENA -o -q $(INPUTFAST)"
        $(H)./$(MAIN).opt -T 1 -o -q $(O) $(INPUTFAST) > etc/log.txt
 
+test-si: $(MAIN).opt etc
+       @echo "  HELENA -d -l -p -o $(INPUT)"
+       $(H)./$(MAIN).opt -T 2 -d -l -p -o $(O) $(INPUT) > etc/log.txt
+
+test-si-matita matita/$(MA): $(MAIN).opt etc
+       @echo "  HELENA -d -l -m -p -o $(INPUT)"
+       $(H)./$(MAIN).opt -T 2 -a n -d -l -m $(PREAMBLE) -p -o $(O) $(INPUT) > etc/log.txt
+
 profile: $(MAIN).opt etc
        @echo "  HELENA -o -q $(INPUTFAST) (30 TIMES)"
        $(H)rm etc/log.txt
        $(H)for T in `seq 30`; do ./$(MAIN).opt -T 1 -o -q $(O) $(INPUTFAST) >> etc/log.txt; done
        $(H)grep "at exit" etc/log.txt | sort | uniq > etc/profile-new.txt
 
-xml-si: $(MAIN).opt etc
-       @echo "  HELENA -l -o -s 2 -x $(INPUT)"
-       $(H)./$(MAIN).opt -O $(XMLDIR) -T 1 -l -o -s 2 -x $(INPUT) > etc/log.txt
-
 xml-si-crg: $(MAIN).opt etc
        @echo "  HELENA -l -o -s 1 -x $(INPUT)"
        $(H)./$(MAIN).opt -O $(XMLDIR) -T 1 -l -o -s 1 -x $(INPUT) > etc/log.txt
 
-matita: $(MA)
-       @echo "  MATITA $<"
-       $(H)$(MATITA) $<
+xml-si: $(MAIN).opt etc
+       @echo "  HELENA -l -o -s 2 -x $(INPUT)"
+       $(H)./$(MAIN).opt -O $(XMLDIR) -T 1 -l -o -s 2 -x $(INPUT) > etc/log.txt
+
+matita: matita/$(MA)
+       @echo "  MATITA $(MA)"
+       $(H)cd matita && $(MATITA) $(MA)
 
-matitac: $(MA)
-       @echo "  MATITAC $<"
-       $(H)$(MATITAC) $<
+matitac: matita/$(MA)
+       @echo "  MATITAC $(MA)"
+       $(H)cd matita && $(MATITAC) $(MA)