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

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