some corrections and additions

[helm.git] / helm / software / matita / contribs / LAMBDA-TYPES / Makefile

diff --git a/helm/software/matita/contribs/LAMBDA-TYPES/Makefile b/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
index 569dd292b75f31e82bad800c4260fb90fbb8fc63..214ce0711b0a281d68f92d2a50a1dcb0a286b2b1 100644 (file)
--- a/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
+++ b/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
@@ -1,18 +1,18 @@
 H=@
 
-MATITAOPTIONS=-onepass
+MATITAOPTIONS=$(MATITAUSEROPTIONS) -onepass
 
 DIR=$(shell basename $$PWD)
 
 MMAS = $(shell find Base-2 -name "*.mma")
 MAS = $(MMAS:%.mma=%.ma)
-XMAS = Base-2/theory.ma
+XMAS = Base-2/theory.ma LambdaDelta-2/theory.ma
 
 $(DIR) all: depends
-       $(H)$(MAKE) --no-print-directory build
+       $(H)$(MAKE) H=$(H) --no-print-directory build
 
 $(DIR).opt opt all.opt: depends
-       $(H)$(MAKE) --no-print-directory build.opt
+       $(H)$(MAKE) H=$(H) --no-print-directory build.opt
 
 build: $(MAS)
        $(H)$echo Base-2/theory.ma `../../matitadep.opt -stdout Base-2/theory.ma` >> depends
@@ -25,15 +25,15 @@ build.opt: $(MAS)
        $(H)rm depends
 
 clean:
-       $(H)../../matitaclean
+       $(H)../../matitaclean $(MATITAOPTIONS)
        $(H)rm -f $(MAS) depends
 
 clean.opt:
-       $(H)../../matitaclean.opt
+       $(H)../../matitaclean.opt $(MATITAOPTIONS)
        $(H)rm -f $(MAS) depends
 
 clean.ma:
-       $(H)../../matitaclean.opt $(MAS)
+       $(H)../../matitaclean.opt $(MATITAOPTIONS) $(MAS)
        $(H)rm -f $(MAS) depends
 
 depend:
@@ -48,7 +48,7 @@ depend.opt:
 depends: depend.opt
 
 %.ma: %.mma
-       $(H)../../matitac.opt $(MATITAOPTIONS) `../../matitadep.opt -stdout $<` 2> /dev/null
+       $(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