ready for 0.1.1 release

[helm.git] / helm / matita / Makefile.in

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index a3a6fe77dc617050a913f1685587a9e5d4299c8e..093a3217dda6c5ffc833a7bf4b37c6db1e1adc79 100644 (file)
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -21,6 +21,7 @@ OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLC_FLAGS) $(OCAML_DEBUG_FLAGS)
 OCAMLOPT = $(OCAMLFIND) opt $(OCAMLC_FLAGS)
 OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAML_FLAGS)
 # objects for matita (GTK GUI)
+NULL =
 CMOS =                         \
        buildTimeConf.cmo       \
        matitaLog.cmo           \
@@ -29,16 +30,17 @@ CMOS =                              \
        matitaMisc.cmo          \
        matitaDb.cmo            \
        matitaSync.cmo          \
-       matitacleanLib.cmo \
+       matitacleanLib.cmo      \
        matitaDisambiguator.cmo \
        matitaEngine.cmo        \
-       matitacLib.cmo \
-       matitamakeLib.cmo \
+       matitacLib.cmo          \
+       matitamakeLib.cmo       \
        matitaScript.cmo        \
        matitaGeneratedGui.cmo  \
        matitaGtkMisc.cmo       \
+       matitaMathView.cmo      \
        matitaGui.cmo           \
-       matitaMathView.cmo 
+       $(NULL)
 # objects for matitac (batch compiler)
 CCMOS =                                \
        buildTimeConf.cmo       \
@@ -49,23 +51,27 @@ CCMOS =                             \
        matitaDb.cmo            \
        matitaSync.cmo          \
        matitaDisambiguator.cmo \
-       matitaEngine.cmo        \
        matitacleanLib.cmo      \
-       matitacLib.cmo
+       matitaEngine.cmo        \
+       matitacLib.cmo          \
+       $(NULL)
 CLEANCMOS = $(CCMOS)
 MAKECMOS = $(CCMOS) matitamakeLib.cmo
 
-
 all: matita.conf.xml matita matitac matitatop cicbrowser matitadep matitaclean matitamake
 
 matita.conf.xml: matita.conf.xml.sample
-       @echo
-       @echo "matita.conf.xml.sample is newer than matita.conf.xml"
-       @echo
-       @echo "PLEASE update your configuration file!"
-       @echo "(copying matita.conf.xml.sample should work)"
-       @echo
-       @false
+       @if diff matita.conf.xml.sample matita.conf.xml 1>/dev/null 2>/dev/null; then\
+               touch matita.conf.xml;\
+       else\
+               echo;\
+               echo "matita.conf.xml.sample is newer than matita.conf.xml";\
+               echo;\
+               echo "PLEASE update your configuration file!";\
+               echo "(copying matita.conf.xml.sample should work)";\
+               echo;\
+               false;\
+       fi
 
 matita.conf.xml.sample: matita.conf.xml.sample.in
        autoconf
@@ -156,12 +162,15 @@ distclean: clean
        rm -f configure matita.conf.xml.sample
 
 tests: matitac matitadep matitaclean
-       @(cd library && make clean all)
-       @(cd tests && make clean all)
+       @(cd library && make MATITAC="- ../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac ../matitaclean /dev/null" clean all)
+       @(cd tests && make MATITAC="- ../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac ../matitaclean /dev/null" clean all)
 tests.opt: matitac.opt matitadep.opt matitaclean.opt
-       @(cd library && make clean.opt opt)
-       @(cd tests && make clean.opt opt)
-.PHONY: tests tests.opt
+       @(cd library && make MATITAC="- ../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac.opt ../matitaclean.opt /dev/null" clean.opt opt)
+       @(cd tests && make MATITAC="- ../scripts/do_tests.sh $(DO_TESTS_OPTS) ../matitac.opt ../matitaclean.opt /dev/null" clean.opt opt)
+cleantests: matitaclean
+       @(cd library && make clean)
+       @(cd tests && make clean)
+.PHONY: tests tests.opt cleantests
 
 tags: TAGS
 .PHONY: TAGS
@@ -188,3 +197,4 @@ endif
 ifeq ($(MAKECMDGOALS),opt)
    $(CMOS:%.cmo=%.cmi): $(LIBX_DEPS)
 endif
+