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

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 3d59960c0..301eb2efc 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -21,42 +21,51 @@ 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 \
-	matitamakeLib.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
+	matitacLib.cmo		\
+	$(NULL)
 CLEANCMOS = $(CCMOS)
-MAKECMOS = $(CCMOS) matitamakeLib.cmo
-
+MAKECMOS = $(CCMOS) 
+PROGRAMS = matita matitac matitatop cicbrowser matitadep matitaclean matitamake
+PROGRAMS_OPT = $(patsubst %,%.opt,$(PROGRAMS))
 
-all: matita.conf.xml matita matitac matitatop cicbrowser matitadep matitaclean matitamake
+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\
@@ -93,7 +102,7 @@ CLEANLIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -forma
 CLEANLIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(CLEANREQUIRES))
 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: matita.opt matitac.opt cicbrowser.opt matitadep.opt matitaclean.opt matitamake.opt
+opt: $(PROGRAMS_OPT)
 else
 opt:
 	@echo "Native code compilation is disabled"
@@ -104,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
@@ -151,7 +163,9 @@ clean:
 		cicbrowser cicbrowser.opt	\
 		matitadep matitadep.opt \
 		matitaclean matitaclean.opt \
-		matitatop matitatop.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
@@ -162,12 +176,15 @@ distclean: clean
 tests: matitac matitadep matitaclean
 	@(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 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
@@ -195,3 +212,4 @@ endif
 ifeq ($(MAKECMDGOALS),opt)
    $(CMOS:%.cmo=%.cmi): $(LIBX_DEPS)
 endif
+