* ocaml => components

[helm.git] / matita / Makefile

diff --git a/matita/Makefile b/matita/Makefile
index 46ad75c29d602211385858475d789c5101f1e62d..5edaeee643827857b654eb2f0014ece759f7d4f2 100644 (file)
--- a/matita/Makefile
+++ b/matita/Makefile
@@ -35,6 +35,7 @@ CMOS =                                \
        matitaExcPp.cmo         \
        matitaEngine.cmo        \
        matitacLib.cmo          \
+       matitaprover.cmo        \
        applyTransformation.cmo \
        matitaGtkMisc.cmo       \
        matitaScript.cmo        \
@@ -115,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
@@ -196,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)
@@ -298,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))
@@ -329,10 +342,13 @@ 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 $< $@
-matitaprover.opt.static: matitac.opt.static
-       $(H)test -f $@ || ln -s $< $@
 matitaclean.opt.static: matitac.opt.static
        $(H)test -f $@ || ln -s $< $@
 matitamake.opt.static: matitac.opt.static