X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FMakefile.in;h=301eb2efcf1bb42f814b1fd2c25da2cd5ca0cc2e;hb=b2f2e47efe1e01df81cb7659c30eeb76f1f830da;hp=d1eff032ae738fb4610321f9b355524e17ce2b33;hpb=ee3f2aa5b78aa77555e5e81d5a2d92501889649e;p=helm.git

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index d1eff032a..301eb2efc 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -21,46 +21,77 @@ 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		\
 	matitaTypes.cmo		\
+	matitaMoo.cmo		\
 	matitaExcPp.cmo 	\
 	matitaMisc.cmo		\
 	matitaDb.cmo		\
+	matitamakeLib.cmo	\
+	matitaInit.cmo	\
 	matitaSync.cmo		\
-	matitacleanLib.cmo \
+	matitacleanLib.cmo	\
 	matitaDisambiguator.cmo	\
 	matitaEngine.cmo	\
+	matitacLib.cmo		\
 	matitaScript.cmo	\
 	matitaGeneratedGui.cmo	\
 	matitaGtkMisc.cmo	\
+	matitaMathView.cmo 	\
 	matitaGui.cmo		\
-	matitaMathView.cmo 
+	$(NULL)
 # objects for matitac (batch compiler)
 CCMOS =				\
 	buildTimeConf.cmo	\
 	matitaLog.cmo		\
 	matitaTypes.cmo		\
+	matitaMoo.cmo		\
 	matitaExcPp.cmo 	\
 	matitaMisc.cmo		\
 	matitaDb.cmo		\
+	matitamakeLib.cmo	\
+	matitaInit.cmo \
 	matitaSync.cmo		\
 	matitaDisambiguator.cmo	\
+	matitacleanLib.cmo	\
 	matitaEngine.cmo	\
-	matitacLib.cmo
-CLEANCMOS = $(CCMOS) matitacleanLib.cmo
-
-
-all: matita matitac matitatop cicbrowser matitadep matitaclean
-
-updater: $(LIB_DEPS)
-	$(OCAMLC) $(PKGS) -linkpkg -o $@ updater.ml
+	matitacLib.cmo		\
+	$(NULL)
+CLEANCMOS = $(CCMOS)
+MAKECMOS = $(CCMOS) 
+PROGRAMS = matita matitac matitatop cicbrowser matitadep matitaclean matitamake
+PROGRAMS_OPT = $(patsubst %,%.opt,$(PROGRAMS))
+
+all: matita.conf.xml $(PROGRAMS) dump_moo
+
+matita.conf.xml: matita.conf.xml.sample
+	@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
+	./configure
+	@echo 
+	@echo "WARNING: The configuration sample file has changed!"
+	@echo 
 
 ifeq ($(HAVE_OCAMLOPT),yes)
 CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
 CCMXS = $(patsubst %.cmo,%.cmx,$(CCMOS))
 CLEANCMXS = $(patsubst %.cmo,%.cmx,$(CLEANCMOS))
+MAKECMXS = $(patsubst %.cmo,%.cmx,$(MAKECMOS))
 LIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(REQUIRES))
 LIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(REQUIRES))
 CLIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(CREQUIRES))
@@ -69,7 +100,9 @@ DEPLIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format
 DEPLIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(DEPREQUIRES))
 CLEANLIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(CLEANREQUIRES))
 CLEANLIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(CLEANREQUIRES))
-opt: matita.opt matitac.opt cicbrowser.opt matitadep.opt matitaclean.opt
+MAKELIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(MAKEREQUIRES))
+MAKELIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(MAKEREQUIRES))
+opt: $(PROGRAMS_OPT)
 else
 opt:
 	@echo "Native code compilation is disabled"
@@ -80,6 +113,9 @@ matita: $(LIB_DEPS) $(CMOS) matita.ml
 matita.opt: $(LIBX_DEPS) $(CMXS) matita.ml
 	$(OCAMLOPT) $(PKGS) -linkpkg -o $@ $(CMXS) matita.ml
 
+dump_moo: buildTimeConf.cmo matitaLog.cmo matitaMoo.cmo dump_moo.ml
+	$(OCAMLC) $(PKGS) -linkpkg -o $@ $^
+
 matitac: $(CLIB_DEPS) $(CCMOS) matitac.ml
 	$(OCAMLC) $(CPKGS) -linkpkg -o $@ $(CCMOS) matitac.ml
 matitac.opt: $(CLIBX_DEPS) $(CCMXS) matitac.ml
@@ -98,6 +134,11 @@ matitaclean: matitaclean.ml $(CLEANLIB_DEPS) $(CLEANCMOS)
 matitaclean.opt: matitaclean.ml $(CLEANLIB_DEPS) $(CLEANCMXS)
 	$(OCAMLOPT) $(CLEANPKGS) -linkpkg -o $@ $(CLEANCMXS) $<
 
+matitamake: matitamake.ml $(MAKECMOS)
+	$(OCAMLC) $(PKGS) -linkpkg -o $@ $(MAKECMOS) $<
+matitamake.opt: matitamake.ml $(MAKECMXS)
+	$(OCAMLOPT) $(PKGS) -linkpkg -o $@ $(MAKECMXS) $<
+	
 cicbrowser: matita
 	@test -f $@ || ln -s $< $@
 cicbrowser.opt: matita.opt
@@ -121,20 +162,30 @@ clean:
 		matita matita.opt matitac matitac.opt	\
 		cicbrowser cicbrowser.opt	\
 		matitadep matitadep.opt \
-		matitaclean matitaclean.opt
+		matitaclean matitaclean.opt \
+		matitamake matitamake.opt \
+		matitatop matitatop.opt \
+		dump_moo
 distclean: clean
 	rm -f matitaGeneratedGui.ml matitaGeneratedGui.mli
 	rm -f config.log config.status Makefile buildTimeConf.ml
 	rm -f matita.glade.bak matita.gladep.bak
 	rm -rf autom4te.cache/
+	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)
+	@(cd contribs/LAMBDA-TYPES && 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)
+	@(cd contribs/LAMBDA-TYPES && 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)
+	@(cd contribs/LAMBDA-TYPES && make clean)
+.PHONY: tests tests.opt cleantests
 
 tags: TAGS
 .PHONY: TAGS
@@ -161,3 +212,4 @@ endif
 ifeq ($(MAKECMDGOALS),opt)
    $(CMOS:%.cmo=%.cmi): $(LIBX_DEPS)
 endif
+