X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fcontribs%2FLAMBDA-TYPES%2FMakefile;h=3e42a4ea18c5fd0fd93d5b0a149b47c6009aef07;hb=d6a9ed2a08fcc4e3e26a40cde8cab88c2c69cb3a;hp=a5bf300152540a9a1c0a3ab72a57a06ac08947c1;hpb=3b2361afb73203749541ad07e94648da6057ae67;p=helm.git

diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Makefile b/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
index a5bf30015..3e42a4ea1 100644
--- a/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
+++ b/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
@@ -1,64 +1,50 @@
 include ../Makefile.defs
 
+DIR=$(shell basename $$PWD)
+
 H=@
 
 MATITAOPTIONS=$(MATITAUSEROPTIONS) -onepass
 
-DIR=$(shell basename $$PWD)
+LOG = log.txt
 
-MMAS = $(shell find Legacy-2 -name "*.mma")
-# Base-2 
+MMAS = $(shell find -name "*.mma")
 MAS = $(MMAS:%.mma=%.ma)
-XMAS = Legacy-2/theory.ma Base-2/theory.ma LambdaDelta-2/theory.ma
-
-$(DIR) all: depends
-	$(H)$(MAKE) H=$(H) --no-print-directory build
 
-$(DIR).opt opt all.opt: depends
-	$(H)$(MAKE) H=$(H) --no-print-directory build.opt
-
-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
-
-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
+$(DIR) all:
+	$(H)$(RM) $(LOG)
+	$(H)$(BIN)matitac $(MATITAOPTIONS) 2>> $(LOG)
+$(DIR).opt opt all.opt:
+	$(H)$(RM) $(LOG)
+	$(H)$(BIN)matitac.opt $(MATITAOPTIONS) 2>> $(LOG)
+
+%.ma %.mma: 
+	$(H)$(RM) $(LOG)
+	$(H)$(BIN)matitac $(MATITAOPTIONS) $@ 2>> $(LOG)
+%.ma.opt: 
+	$(H)$(RM) $(LOG)
+	$(H)$(BIN)matitac.opt $(MATITAOPTIONS) $*.ma 2>> $(LOG)
+%.mma.opt: 
+	$(H)$(RM) $(LOG)
+	$(H)$(BIN)matitac.opt $(MATITAOPTIONS) $*.mma 2>> $(LOG)
 
 clean:
 	$(H)$(BIN)matitaclean $(MATITAOPTIONS)
-	$(H)rm -f $(MAS) depends
-
+	$(H)$(RM) $(MAS)
 clean.opt:
 	$(H)$(BIN)matitaclean.opt $(MATITAOPTIONS)
-	$(H)rm -f $(MAS) depends
-
-clean.ma:
-	$(H)$(BIN)matitaclean.opt $(MATITAOPTIONS) $(MAS)
-	$(H)rm -f $(MAS) depends
+	$(H)$(RM) $(MAS)
 
 depend:
-	@echo matitadep
-	$(H)$(BIN)matitadep $(foreach FILE,$(XMAS),-exclude $(FILE))
-	$(H)cat Legacy-2/depends >> depends
-# Base-2/depends
-	
+	$$(H)(BIN)matitadep $(MATITAOPTIONS)
 depend.opt:
-	@echo matitadep.opt
-	$(H)$(BIN)matitadep.opt $(foreach FILE,$(XMAS),-exclude $(FILE))
-	$(H)cat Legacy-2/depends >> depends
-# Base-2/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)echo $@ `$(BIN)matitadep.opt -stdout $@` >> depends
+	$(H)$(BIN)matitadep.opt $(MATITAOPTIONS)
 
-include Legacy-2/.depend
-# include Base-2/.depend
+ifneq ($(strip $(MAS)),)
+clean.ma:
+	$(H)$(BIN)matitaclean.opt $(MATITAOPTIONS) $(MAS)
+	$(H)$(RM) $(MAS)
+else
+clean.ma:
+	$(H)echo no files to clean
+endif