X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fcontribs%2FLAMBDA-TYPES%2FMakefile;h=a5bf300152540a9a1c0a3ab72a57a06ac08947c1;hb=3b2361afb73203749541ad07e94648da6057ae67;hp=c0805522d04b2c5efca292fbffa0a9b3978056ee;hpb=076f639446efce8d8cf83dcf7ca40b4376fc8c36;p=helm.git

diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Makefile b/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
index c0805522d..a5bf30015 100644
--- a/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
+++ b/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
@@ -1,12 +1,15 @@
+include ../Makefile.defs
+
 H=@
 
-MATITAOPTIONS=-onepass
+MATITAOPTIONS=$(MATITAUSEROPTIONS) -onepass
 
 DIR=$(shell basename $$PWD)
 
-MMAS = $(shell find Base-2 -name "*.mma")
+MMAS = $(shell find Legacy-2 -name "*.mma")
+# Base-2 
 MAS = $(MMAS:%.mma=%.ma)
-XMAS = Base-2/theory.ma LambdaDelta-2/theory.ma
+XMAS = Legacy-2/theory.ma Base-2/theory.ma LambdaDelta-2/theory.ma
 
 $(DIR) all: depends
 	$(H)$(MAKE) H=$(H) --no-print-directory build
@@ -15,41 +18,47 @@ $(DIR).opt opt all.opt: depends
 	$(H)$(MAKE) H=$(H) --no-print-directory build.opt
 
 build: $(MAS)
-	$(H)$echo Base-2/theory.ma `../../matitadep.opt -stdout Base-2/theory.ma` >> depends
-	$(H)../../matitac $(MATITAOPTIONS) 2> /dev/null
+	$(H)echo Legacy-2/theory.ma `$(BIN)matitadep.opt -stdout Legacy-2/theory.ma` >> depends
+#	$(H)echo Base-2/theory.ma `$(BIN)matitadep.opt -stdout Base-2/theory.ma` >> depends
+	$(H)$(BIN)matitac $(MATITAOPTIONS) 2> /dev/null
 	$(H)rm depends
 
 build.opt: $(MAS)
-	$(H)echo Base-2/theory.ma `../../matitadep.opt -stdout Base-2/theory.ma` >> depends
-	$(H)../../matitac.opt $(MATITAOPTIONS) 2> /dev/null
+	$(H)echo Legacy-2/theory.ma `$(BIN)matitadep.opt -stdout Legacy-2/theory.ma` >> depends
+#	$(H)echo Base-2/theory.ma `$(BIN)matitadep.opt -stdout Base-2/theory.ma` >> depends
+	$(H)$(BIN)matitac.opt $(MATITAOPTIONS) 2> /dev/null
 	$(H)rm depends
 
 clean:
-	$(H)../../matitaclean $(MATITAOPTIONS)
+	$(H)$(BIN)matitaclean $(MATITAOPTIONS)
 	$(H)rm -f $(MAS) depends
 
 clean.opt:
-	$(H)../../matitaclean.opt $(MATITAOPTIONS)
+	$(H)$(BIN)matitaclean.opt $(MATITAOPTIONS)
 	$(H)rm -f $(MAS) depends
 
 clean.ma:
-	$(H)../../matitaclean.opt $(MATITAOPTIONS) $(MAS)
+	$(H)$(BIN)matitaclean.opt $(MATITAOPTIONS) $(MAS)
 	$(H)rm -f $(MAS) depends
 
 depend:
 	@echo matitadep
-	$(H)../../matitadep $(foreach FILE,$(XMAS),-exclude $(FILE))
-	$(H)cat Base-2/depends >> depends
+	$(H)$(BIN)matitadep $(foreach FILE,$(XMAS),-exclude $(FILE))
+	$(H)cat Legacy-2/depends >> depends
+# Base-2/depends
+	
 depend.opt:
 	@echo matitadep.opt
-	$(H)../../matitadep.opt $(foreach FILE,$(XMAS),-exclude $(FILE))
-	$(H)cat Base-2/depends >> depends
+	$(H)$(BIN)matitadep.opt $(foreach FILE,$(XMAS),-exclude $(FILE))
+	$(H)cat Legacy-2/depends >> depends
+# Base-2/depends
 
 depends: depend.opt
 
 %.ma: %.mma
-	$(H)../../matitac.opt $(MATITAOPTIONS) $(word 3,$(shell grep -h $< */depends)) `../../matitadep.opt -stdout $<` 2> /dev/null
-	$(H)../../matitac.opt $(MATITAOPTIONS) -dump $@ $< 2> /dev/null
-	$(H)echo $@ `../../matitadep.opt -stdout $@` >> depends
+	$(H)$(BIN)matitac.opt $(MATITAOPTIONS) $(word 3,$(shell grep -h $< */depends)) `$(BIN)matitadep.opt -stdout $<` 2> /dev/null
+	$(H)$(BIN)matitac.opt $(MATITAOPTIONS) -dump $@ $< 2> /dev/null
+	$(H)echo $@ `$(BIN)matitadep.opt -stdout $@` >> depends
 
-include Base-2/.depend
+include Legacy-2/.depend
+# include Base-2/.depend