X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fcontribs%2FLAMBDA-TYPES%2FMakefile;h=e44fbb49acf339c35dbe10dc65136e69a5ae4bae;hb=9ece6e414b255f519426d5643782af4f7dfc584f;hp=0ccf2514af67cb42147d3633c44e4afe229a9187;hpb=f5dfc6c24a393a4717a7b40689df768d271d9ac0;p=helm.git

diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Makefile b/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
index 0ccf2514a..e44fbb49a 100644
--- a/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
+++ b/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
@@ -1,55 +1,68 @@
+include ../Makefile.defs
+
 H=@
 
 MATITAOPTIONS=$(MATITAUSEROPTIONS) -onepass
 
-DIR=$(shell basename $$PWD)
+LOG = log.txt
+
+DIRS = Legacy-2 Base-2 LambdaDelta-2
+
+SILENTMAKE = $(H)$(MAKE) H=$(H) -s --no-print-directory
+
+MAS = $(shell find $(DIRS) -mindepth 2 -name "*.ma")
 
-MMAS = $(shell find -name "*.mma") # Base-2
-MAS = $(MMAS:%.mma=%.ma)
-XMAS = Base-2/theory.ma LambdaDelta-2/theory.ma
+all: depends
+	$(H)$(RM) $(LOG)
+	$(SILENTMAKE) build
 
-$(DIR) all: depends
-	$(H)$(MAKE) H=$(H) --no-print-directory build
+opt all.opt: depends
+	$(H)$(RM) $(LOG)
+	$(SILENTMAKE) build.opt
 
-$(DIR).opt opt all.opt: depends
-	$(H)$(MAKE) H=$(H) --no-print-directory build.opt
+%.build.opt:
+	$(SILENTMAKE) $(patsubst %.mma, %.ma, $(shell find $* -name "*.mma"))
+	$(H)echo $*/theory.ma `$(BIN)matitadep.opt -stdout $*/theory.ma` >> depends
 
-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: $(DIRS:%=%.build.opt)
+	$(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
+build.opt: $(DIRS:%=%.build.opt)
+	$(H)$(BIN)matitac.opt $(MATITAOPTIONS) 2>> $(LOG)
+	$(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)rm -f $(MAS) depends
+	$(H)$(BIN)matitaclean.opt $(MATITAOPTIONS) $(MAS)
+	$(H)$(RM) $(MAS) depends
+
+
+clean.mma:
+#	$(H)for FILE in */*.mma ; do if [ -e ../LambdaDelta-1/$${FILE/.mma/.ma} ] ; then true ; else rm $$FILE ; fi done
 
 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)
+	$(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)
+	$(H)cat $(DIRS:%=%/depends) >> 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>> $(LOG)
+	$(H)$(BIN)matitac.opt $(MATITAOPTIONS) -dump $@ $< 2>> $(LOG)
+	$(H)echo $@ `$(BIN)matitadep.opt -stdout $@` >> depends
 
-#include Base-2/.depend
+$(foreach DIR, $(DIRS), $(eval include $(DIR)/.depend))