X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Flibrary%2FMakefile;h=e13b3e8a48d6c05fb5e07f19043e285192c24309;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=1a5411c2caaa73202a0c6453467f27799c937a81;hpb=e5a4502fa68442dad1b771e496b544c6770df751;p=helm.git

diff --git a/helm/matita/library/Makefile b/helm/matita/library/Makefile
index 1a5411c2c..e13b3e8a4 100644
--- a/helm/matita/library/Makefile
+++ b/helm/matita/library/Makefile
@@ -1,33 +1,36 @@
 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 OK
+MATITACOPT=../scripts/do_tests.sh $(DO_TESTS_OPTS) "../matitac.opt $(MATITA_FLAGS)" "../matitaclean.opt $(MATITA_FLAGS)" /dev/null OK
+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
 
 H=@
 
-all: $(SRC:%.ma=%.moo)
+all: $(SRC:%.ma=%.mo)
 
 opt:
-	$(H)make MATITAC="$(MATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
-
-verbose.opt:
-	$(H)make MATITAC="$(VERBOSEMATITAC)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
+	$(H)$(MAKE) MATITAC='$(MATITACOPT)' MATITACLEAN='$(MATITACLEANOPT)' MATITADEP='$(MATITADEPOPT)' all
 
-verboseopt:
-	$(H)make MATITAC="$(VERBOSEMATITACOPT)" MATITACLEAN="$(MATITACLEANOPT)" MATITADEP="$(MATITADEPOPT)" all
+verbose:
+	$(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)
@@ -37,15 +40,15 @@ cleanall:
 	$(MATITACLEAN) all
 
 depend:
-	rm $(DEPEND_NAME)
-	make $(DEPEND_NAME)
+	rm -f $(DEPEND_NAME)
+	$(MAKE) $(DEPEND_NAME)
 .PHONY: depend
 
-%.moo:%.ma
-	$(H)[ ! -e $@ ] || $(MATITACLEAN) $< 
-	$(H)$(MATITAC) $< || $(MATITACLEAN) $<
+%.moo:
+	$(H)$(MATITAC) $<
 
 $(DEPEND_NAME): $(SRC)
-	$(H)$(MATITADEP) $(SRC) > $@
+	$(H)$(MATITADEP) $(SRC) > $@ || rm -f $@
 
-include $(DEPEND_NAME)
+#include $(DEPEND_NAME)
+include .depend