X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2FMakefile;h=5edaeee643827857b654eb2f0014ece759f7d4f2;hb=5a9445562fe66eb78f7f1a0c3a75c569430c63ac;hp=a126ab8accf1f0fec7ef97beac1bfea3537843f2;hpb=e6bdb7d7400df360a5b36b411a27c754080e5363;p=helm.git

diff --git a/matita/Makefile b/matita/Makefile
index a126ab8ac..5edaeee64 100644
--- a/matita/Makefile
+++ b/matita/Makefile
@@ -16,7 +16,7 @@ OCAMLOPT = $(OCAMLFIND) opt $(OCAMLC_FLAGS)
 OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAML_FLAGS)
 INSTALL_PROGRAMS= matita matitac
 INSTALL_PROGRAMS_LINKS_MATITA= cicbrowser 
-INSTALL_PROGRAMS_LINKS_MATITAC= matitadep matitamake matitaclean
+INSTALL_PROGRAMS_LINKS_MATITAC= matitadep matitamake matitaclean matitaprover
 
 MATITA_FLAGS = -noprofile
 NODB=false
@@ -27,6 +27,7 @@ endif
 # objects for matita (GTK GUI)
 CMOS =				\
 	buildTimeConf.cmo	\
+	lablGraphviz.cmo	\
 	matitaTypes.cmo		\
 	matitaMisc.cmo		\
 	matitamakeLib.cmo	\
@@ -34,6 +35,7 @@ CMOS =				\
 	matitaExcPp.cmo 	\
 	matitaEngine.cmo	\
 	matitacLib.cmo		\
+	matitaprover.cmo        \
 	applyTransformation.cmo	\
 	matitaGtkMisc.cmo	\
 	matitaScript.cmo	\
@@ -51,6 +53,7 @@ CCMOS =				\
 	matitaExcPp.cmo 	\
 	matitaEngine.cmo	\
 	matitacLib.cmo		\
+	matitaprover.cmo        \
 	$(NULL)
 MAINCMOS =			\
 	matitadep.cmo		\
@@ -59,7 +62,7 @@ MAINCMOS =			\
 	gragrep.cmo 		\
 	$(NULL)
 PROGRAMS_BYTE = \
-	matita matitac cicbrowser matitadep matitaclean matitamake
+	matita matitac cicbrowser matitadep matitaclean matitamake matitaprover
 PROGRAMS = $(PROGRAMS_BYTE) matitatop
 PROGRAMS_OPT = $(patsubst %,%.opt,$(PROGRAMS_BYTE))
 NOINST_PROGRAMS = dump_moo gragrep
@@ -113,6 +116,10 @@ links:
 	$(H)ln -sf matita.opt matita
 	$(H)ln -sf matitac.opt matitac
 
+linkonly:
+	$(H)echo "  OCAMLC matita.ml"
+	$(H)$(OCAMLC) $(PKGS) -linkpkg -o matita $(CMOS) matita.ml
+.PHONY: linkonly
 matita: matita.ml $(LIB_DEPS) $(CMOS)
 	$(H)echo "  OCAMLC $<"
 	$(H)$(OCAMLC) $(PKGS) -linkpkg -o $@ $(CMOS) matita.ml
@@ -138,6 +145,11 @@ matitatop: matitatop.ml $(CLIB_DEPS) $(CCMOS)
 	$(H)echo "  OCAMLC $<"
 	$(H)$(OCAMLC) $(CPKGS) -linkpkg -o $@ toplevellib.cma $(CCMOS) $<
 
+matitaprover: matitac
+	$(H)test -f $@ || ln -s $< $@
+matitaprover.opt: matitac.opt
+	$(H)test -f $@ || ln -s $< $@
+
 matitadep: matitac
 	$(H)test -f $@ || ln -s $< $@
 matitadep.opt: matitac.opt
@@ -189,9 +201,9 @@ distclean: clean
 TEST_DIRS = 				\
 	library 			\
 	tests 				\
-	contribs/LAMBDA-TYPES 		\
-	contribs/PREDICATIVE-TOPOLOGY 	\
 	$(NULL)
+#	contribs/LAMBDA-TYPES 		\
+#	contribs/PREDICATIVE-TOPOLOGY 	\
 
 .PHONY: tests tests.opt cleantests cleantests.opt
 tests: $(foreach d,$(TEST_DIRS),$(d)-test)
@@ -291,6 +303,14 @@ STATIC_CLIBS = \
 	gdome \
 	mysqlclient \
 	$(NULL)
+STATIC_CLIBS_PROVER = \
+        $(STATIC_CLIBS) \
+	z \
+	pcre \
+	expat \
+	xml2 \
+	glib-2.0 \
+	$(NULL)
 STATIC_EXTRA_CLIBS =
 PROGRAMS_STATIC = $(patsubst %,%.static,$(PROGRAMS_OPT))
 PROGRAMS_UPX = $(patsubst %,%.upx,$(PROGRAMS_STATIC))
@@ -322,6 +342,11 @@ matitac.opt.static: $(STATIC_LINK) $(CLIBX_DEPS) $(CCMXS) $(MAINCMXS) matitac.ml
 		$(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) $(MAINCMXS) matitac.ml \
 		$(STATIC_EXTRA_CLIBS)
 	strip $@
+matitaprover.opt.static: $(STATIC_LINK) $(CLIBX_DEPS) $(CCMXS) $(MAINCMXS) matitac.ml
+	$(STATIC_LINK) $(STATIC_CLIBS_PROVER) -- \
+		$(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) $(MAINCMXS) matitac.ml \
+		$(STATIC_EXTRA_CLIBS);
+	strip $@
 matitadep.opt.static: matitac.opt.static
 	$(H)test -f $@ || ln -s $< $@
 matitaclean.opt.static: matitac.opt.static