X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fcontribs%2FLAMBDA-TYPES%2FMakefile;h=194fc389e5933faab1403df270a975f11c85cc61;hb=a99ab6bf4e5bb993d363a9e62985371ba14cf71a;hp=a2a3b8eecf9a47b97b76df10c30ca63933b0e04c;hpb=a2257181cddf84a3b831c50398f5b13e2b79ac3a;p=helm.git

diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Makefile b/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
index a2a3b8eec..194fc389e 100644
--- a/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
+++ b/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
@@ -1,52 +1,68 @@
+include ../Makefile.defs
+
 H=@
+S=-s
+
+MATITAOPTIONS=$(MATITAUSEROPTIONS) -onepass
+
+LOG = log.txt
+
+DIRS = Legacy-2 Base-2 LambdaDelta-2
 
-MATITAOPTIONS=-onepass
+SILENTMAKE = $(H)$(MAKE) $(S) --no-print-directory H=$(H) S=$(S)
 
-DIR=$(shell basename $$PWD)
+MAS = $(shell find $(DIRS) -mindepth 2 -name "*.ma")
 
-MMAS = $(shell find Base-2 -name "*.mma")
-MAS = $(MMAS:%.mma=%.ma)
-XMAS = Base-2/theory.ma pippo
+all: depends
+	$(H)$(RM) $(LOG)
+	$(SILENTMAKE) build
 
-%.ma: %.mma 
-	$(H)../../matitac.opt $(MATITAOPTIONS) `../../matitadep.opt -stdout $<` 2> /dev/null
-	$(H)../../matitac.opt $(MATITAOPTIONS) -dump $@ $< 2> /dev/null
-	$(H)$(MAKE) --no-print-directory depend.opt
+opt all.opt: depends
+	$(H)$(RM) $(LOG)
+	$(SILENTMAKE) build.opt
+
+%.build.opt:
+	$(SILENTMAKE) $(patsubst %.mma, %.ma, $(shell find $* -name "*.mma"))
+	$(H)echo $*/theory.ma `$(BIN)matitadep.opt -stdout $*/theory.ma` >> 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
 
-$(DIR) all: $(MAS)
-	$(H)$(MAKE) --no-print-directory depend.full
-	$(H)../../matitac $(MATITAOPTIONS) 2> /dev/null
-$(DIR).opt opt all.opt: $(MAS)
-	$(H)$(MAKE) --no-print-directory depend.full.opt
-	$(H)../../matitac.opt $(MATITAOPTIONS) 2> /dev/null
 clean:
-	$(H)../../matitaclean
-	$(H)rm -f $(MAS)
-	$(H)$(MAKE) --no-print-directory depend
+	$(H)$(BIN)matitaclean $(MATITAOPTIONS)
+	$(H)rm -f $(MAS) depends
+
 clean.opt:
-	$(H)../../matitaclean.opt
-	$(H)rm -f $(MAS)
-	$(H)$(MAKE) --no-print-directory depend.opt
+	$(H)$(BIN)matitaclean.opt $(MATITAOPTIONS)
+	$(H)rm -f $(MAS) depends
+
 clean.ma:
-	$(H)../../matitaclean.opt $(MAS)
-	$(H)rm -f $(MAS)
-	$(H)$(MAKE) --no-print-directory depend.opt
+	$(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
-depend.full:
-	@echo matitadep
-	$(H)../../matitadep 
-	$(H)cat Base-2/depends >> depends
-depend.full.opt:
-	@echo matitadep.opt
-	$(H)../../matitadep.opt 
-	$(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)$(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))