X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fcontribs%2FLAMBDA-TYPES%2FMakefile;h=a7046636cd8f2bbfbb8ed7058aa910a17d31f443;hb=c38cc6760eae55641605ac56579340e3e54a44b5;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..a7046636c 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
+
+LOG = log.txt
+
+DIRS = Legacy-2 Base-2
 
-DIR=$(shell basename $$PWD)
+SILENTMAKE = $(H)$(MAKE) H=$(H) -s --no-print-directory
 
-MMAS = $(shell find Base-2 -name "*.mma")
-MAS = $(MMAS:%.mma=%.ma)
-XMAS = Base-2/theory.ma
+MAS = $(patsubst %.mma, %.ma, $(shell find $(DIRS) -name "*.mma"))
 
-$(DIR) all: depends
-	$(H)$(MAKE) --no-print-directory build
+all: depends
+	$(H)$(RM) $(LOG)
+	$(SILENTMAKE) build
 
-$(DIR).opt opt all.opt: depends
-	$(H)$(MAKE) --no-print-directory build.opt
+opt all.opt: depends
+	$(H)$(RM) $(LOG)
+	$(SILENTMAKE) 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
+%.build.opt:
+	$(SILENTMAKE) $(patsubst %.mma, %.ma, $(shell find $* -name "*.mma"))
+	$(H)echo $*/theory.ma `$(BIN)matitadep.opt -stdout $*/theory.ma` >> 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
+build: $(DIRS:%=%.build.opt)
+	$(H)$(BIN)matitac $(MATITAOPTIONS) 2>> $(LOG)
+	$(H)$(RM) depends
+
+build.opt: $(DIRS:%=%.build.opt)
+	$(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)rm -f $(MAS) depends
+	$(H)$(BIN)matitaclean.opt $(MATITAOPTIONS) $(MAS)
+	$(H)$(RM) $(MAS) depends
 
 depend:
 	@echo matitadep
-	$(H)../../matitadep $(foreach FILE,$(XMAS),-exclude $(FILE))
-	$(H)cat Base-2/depends >> depends
+	$(H)$(BIN)matitadep $(foreach DIR, $(DIRS), -exclude $(DIR)/theory.ma) -exclude LambdaDelta-2/theory.ma
+	$(H)cat $(DIRS:%=%/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 DIR, $(DIRS), -exclude $(DIR)/theory.ma) -exclude LambdaDelta-2/theory.ma
+	$(H)cat $(DIRS:%=%/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