NODB implemented

diff --git a/helm/matita/contribs/LAMBDA-TYPES/Makefile b/helm/matita/contribs/LAMBDA-TYPES/Makefile
index f39526a71fff4ed2aa12b93fe882e0706ea119cf..fc2e0ce8438c3c038c9db5486cf76ac3bb2908d0 100644 (file)
--- a/helm/matita/contribs/LAMBDA-TYPES/Makefile
+++ b/helm/matita/contribs/LAMBDA-TYPES/Makefile
@@ -1,15 +1,21 @@
 SRC=$(shell find . -name "*.ma" -a -type f)
 
-MATITAC=../../scripts/do_tests.sh $(DO_TESTS_OPTS) ../../matitac ../../matitaclean /dev/null
-MATITACOPT=../../scripts/do_tests.sh $(DO_TESTS_OPTS) ../../matitac.opt ../../matitaclean.opt /dev/null
-VERBOSEMATITAC=../../matitac
-VERBOSEMATITACOPT=../../matitac.opt
+MATITA_FLAGS =
+NODB=false
+ifeq ($(NODB),true)
+       MATITA_FLAGS += -nodb
+endif
 
-MATITACLEAN=../../matitaclean
-MATITACLEANOPT=../../matitaclean.opt
+MATITAC=../../scripts/do_tests.sh $(DO_TESTS_OPTS) "../../matitac $(MATITA_FLAGS)" "../../matitaclean $(MATITA_FLAGS)" /dev/null
+MATITACOPT=../../scripts/do_tests.sh $(DO_TESTS_OPTS) "../../matitac.opt $(MATITA_FLAGS)" "../../matitaclean.opt $(MATITA_FLAGS)" /dev/null
+VERBOSEMATITAC=../../matitac $(MATITA_FLAGS)
+VERBOSEMATITACOPT=../../matitac.opt $(MATITA_FLAGS)
 
-MATITADEP=../../matitadep
-MATITADEPOPT=../../matitadep.opt
+MATITACLEAN=../../matitaclean $(MATITA_FLAGS)
+MATITACLEANOPT=../../matitaclean.opt $(MATITA_FLAGS)
+
+MATITADEP=../../matitadep $(MATITA_FLAGS)
+MATITADEPOPT=../../matitadep.opt $(MATITA_FLAGS)
 
 DEPEND_NAME=.depend
 
@@ -18,13 +24,13 @@ H=@
 all: $(SRC:%.ma=%.mo)
 
 opt:
-       $(H)make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
+       $(H)$(MAKE) MATITAC='$(MATITACOPT)' MATITACLEAN='$(MATITACLEANOPT)' MATITADEP='$(MATITADEPOPT)' all
 
 verbose:
-       $(H)make MATITAC="$(VERBOSEMATITAC)" MATITACLEAN="$(MATITACLEAN)" MATITADEP="$(MATITADEP)" all
+       $(H)$(MAKE) MATITAC='$(VERBOSEMATITAC)' MATITACLEAN='$(MATITACLEAN)' MATITADEP='$(MATITADEP)' all
 
 %.opt:
-       $(H)make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" $(@:%.opt=%)
+       $(H)$(MAKE) MATITAC='$(MATITACOPT)' MATITACLEAN='$(MATITACLEANOPT)' MATITADEP='$(MATITADEPOPT)' $(@:%.opt=%)
 
 clean:
        $(H)$(MATITACLEAN) $(SRC)
@@ -35,7 +41,7 @@ cleanall:
 
 depend:
        rm -f $(DEPEND_NAME)
-       make $(DEPEND_NAME)
+       $(MAKE) $(DEPEND_NAME)
 .PHONY: depend
 
 %.moo:
@@ -44,4 +50,5 @@ depend:
 $(DEPEND_NAME): $(SRC)
        $(H)$(MATITADEP) $(SRC) > $@ || rm -f $@
 
-include $(DEPEND_NAME)
+#include $(DEPEND_NAME)
+include .depend

diff --git a/helm/matita/tests/Makefile b/helm/matita/tests/Makefile
index 6026113027327a07ba6b5608ebd30281f1da7bb5..d9ce39b18096fb18118926ce88f54181da1dc91c 100644 (file)
--- a/helm/matita/tests/Makefile
+++ b/helm/matita/tests/Makefile
@@ -1,15 +1,21 @@
 SRC=$(wildcard *.ma)
 
-MATITAC=../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac ../matitaclean /dev/null
-MATITACOPT=../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac.opt ../matitaclean.opt /dev/null
-VERBOSEMATITAC=../matitac
-VERBOSEMATITACOPT=../matitac.opt
+MATITA_FLAGS =
+NODB=false
+ifeq ($(NODB),true)
+       MATITA_FLAGS += -nodb
+endif
 
-MATITACLEAN=../matitaclean
-MATITACLEANOPT=../matitaclean.opt
+MATITAC=../scripts/do_tests.sh $(DO_TESTS_OPTS) "../matitac $(MATITA_FLAGS)" "../matitaclean $(MATITA_FLAGS)" /dev/null
+MATITACOPT=../scripts/do_tests.sh $(DO_TESTS_OPTS) "../matitac.opt $(MATITA_FLAGS)" "../matitaclean.opt $(MATITA_FLAGS)" /dev/null
+VERBOSEMATITAC=../matitac $(MATITA_FLAGS)
+VERBOSEMATITACOPT=../matitac.opt $(MATITA_FLAGS)
 
-MATITADEP=../matitadep
-MATITADEPOPT=../matitadep.opt
+MATITACLEAN=../matitaclean $(MATITA_FLAGS)
+MATITACLEANOPT=../matitaclean.opt $(MATITA_FLAGS)
+
+MATITADEP=../matitadep $(MATITA_FLAGS)
+MATITADEPOPT=../matitadep.opt $(MATITA_FLAGS)
 
 DEPEND_NAME=.depend
 
@@ -18,13 +24,13 @@ H=@
 all: $(SRC:%.ma=%.mo)
 
 opt:
-       $(H)make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
+       $(H)$(MAKE) MATITAC='$(MATITACOPT)' MATITACLEAN='$(MATITACLEANOPT)' MATITADEP='$(MATITADEPOPT)' all
 
 verbose:
-       $(H)make MATITAC="$(VERBOSEMATITAC)" MATITACLEAN="$(MATITACLEAN)" MATITADEP="$(MATITADEP)" all
+       $(H)$(MAKE) MATITAC='$(VERBOSEMATITAC)' MATITACLEAN='$(MATITACLEAN)' MATITADEP='$(MATITADEP)' all
 
 %.opt:
-       $(H)make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" $(@:%.opt=%)
+       $(H)$(MAKE) MATITAC='$(MATITACOPT)' MATITACLEAN='$(MATITACLEANOPT)' MATITADEP='$(MATITADEPOPT)' $(@:%.opt=%)
 
 clean:
        $(H)$(MATITACLEAN) $(SRC)
@@ -35,7 +41,7 @@ cleanall:
 
 depend:
        rm -f $(DEPEND_NAME)
-       make $(DEPEND_NAME)
+       $(MAKE) $(DEPEND_NAME)
 .PHONY: depend
 
 %.moo:
@@ -44,4 +50,5 @@ depend:
 $(DEPEND_NAME): $(SRC)
        $(H)$(MATITADEP) $(SRC) > $@ || rm -f $@
 
-include $(DEPEND_NAME)
+#include $(DEPEND_NAME)
+include .depend