freescale moved under contribs. contribs made relocatable

[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 754dde6215383ad9b15a15202586e8ed62602f58..7edd288175fa5f33afdbba7d34b125aceed81dd7 100644 (file)
--- a/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
+++ b/helm/software/matita/contribs/LAMBDA-TYPES/Makefile
@@ -1,3 +1,5 @@
+include ../Makefile.defs
+
 H=@
 
 MATITAOPTIONS=$(MATITAUSEROPTIONS) -onepass
@@ -15,45 +17,45 @@ $(DIR).opt opt all.opt: depends
        $(H)$(MAKE) H=$(H) --no-print-directory build.opt
 
 build: $(MAS)
-       $(H)echo Legacy-2/theory.ma `../../matitadep.opt -stdout Legacy-2/theory.ma` >> depends
-#      $(H)echo Base-2/theory.ma `../../matitadep.opt -stdout Base-2/theory.ma` >> depends
-       $(H)../../matitac $(MATITAOPTIONS) 2> /dev/null
+       $(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 `../../matitadep.opt -stdout Legacy-2/theory.ma` >> depends
-#      $(H)echo Base-2/theory.ma `../../matitadep.opt -stdout Base-2/theory.ma` >> depends
-       $(H)../../matitac.opt $(MATITAOPTIONS) 2> /dev/null
+       $(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
 
 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)$(BIN)matitaclean.opt $(MATITAOPTIONS) $(MAS)
        $(H)rm -f $(MAS) depends
 
 depend:
        @echo matitadep
-       $(H)../../matitadep $(foreach FILE,$(XMAS),-exclude $(FILE))
+       $(H)$(BIN)matitadep $(foreach FILE,$(XMAS),-exclude $(FILE))
        $(H)cat Legacy-2/depends >> depends # Base-2/depends
        
 depend.opt:
        @echo matitadep.opt
-       $(H)../../matitadep.opt $(foreach FILE,$(XMAS),-exclude $(FILE))
+       $(H)$(BIN)matitadep.opt $(foreach FILE,$(XMAS),-exclude $(FILE))
        $(H)cat Legacy-2/depends >> depends # Base-2/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> /dev/null
+       $(H)$(BIN)matitac.opt $(MATITAOPTIONS) -dump $@ $< 2> /dev/null
+       $(H)echo $@ `$(BIN)matitadep.opt -stdout $@` >> depends
 
 include Legacy-2/.depend
 # include Base-2/.depend