X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fcontribs%2FLAMBDA-TYPES%2FMakefile;h=9608434b6afc4f115a1e431456bada8527380578;hb=25aa80d913c903fcc270d05464cf3084b12d52a8;hp=569dd292b75f31e82bad800c4260fb90fbb8fc63;hpb=99c309a47affab5a6e377d10ad77a2a65fec5455;p=helm.git

diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Makefile b/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
index 569dd292b..9608434b6 100644
--- a/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
+++ b/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
@@ -1,55 +1,65 @@
+include ../Makefile.defs
+
 H=@
 
-MATITAOPTIONS=-onepass
+MATITAOPTIONS=$(MATITAUSEROPTIONS) -onepass
 
 DIR=$(shell basename $$PWD)
 
-MMAS = $(shell find Base-2 -name "*.mma")
+LOG = log.txt
+
+MMAS = $(shell find Legacy-2 Base-2 -name "*.mma") 
 MAS = $(MMAS:%.mma=%.ma)
-XMAS = Base-2/theory.ma
+XMAS = Legacy-2/theory.ma Base-2/theory.ma LambdaDelta-2/theory.ma
 
 $(DIR) all: depends
-	$(H)$(MAKE) --no-print-directory build
+	$(H)$(RM) $(LOG)
+	$(H)$(MAKE) H=$(H) --no-print-directory build
 
 $(DIR).opt opt all.opt: depends
-	$(H)$(MAKE) --no-print-directory build.opt
+	$(H)$(RM) $(LOG)
+	$(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)rm depends
+	$(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>> $(LOG)
+	$(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)rm depends
+	$(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>> $(LOG)
+	$(H)$(RM) depends
 
 clean:
-	$(H)../../matitaclean
+	$(H)$(BIN)matitaclean $(MATITAOPTIONS)
 	$(H)rm -f $(MAS) depends
 
 clean.opt:
-	$(H)../../matitaclean.opt
+	$(H)$(BIN)matitaclean.opt $(MATITAOPTIONS)
 	$(H)rm -f $(MAS) depends
 
 clean.ma:
-	$(H)../../matitaclean.opt $(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 Base-2/depends >> 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 Base-2/depends >> depends
 
 depends: depend.opt
 
 %.ma: %.mma
-	$(H)../../matitac.opt $(MATITAOPTIONS) `../../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>> $(LOG)
+	$(H)$(BIN)matitac.opt $(MATITAOPTIONS) -dump $@ $< 2>> $(LOG)
+	$(H)echo $@ `$(BIN)matitadep.opt -stdout $@` >> depends
 
+include Legacy-2/.depend
 include Base-2/.depend