X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2FMakefile;h=c0e31d64315558d6709e900a60e58f7429f9aed7;hb=06a089726af079d5b2fe42ba78632565dad0eb3e;hp=46ad75c29d602211385858475d789c5101f1e62d;hpb=894b08ca7d14aa7e31c35f3acb3903a1c3472a27;p=helm.git

diff --git a/matita/Makefile b/matita/Makefile
index 46ad75c29..c0e31d643 100644
--- 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,12 @@ 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
+	$(H)echo "  OCAMLC matitac.ml"
+	$(H)$(OCAMLC) $(CPKGS) -linkpkg -o matitac $(CCMOS) $(MAINCMOS) matitac.ml
+.PHONY: linkonly
 matita: matita.ml $(LIB_DEPS) $(CMOS)
 	$(H)echo "  OCAMLC $<"
 	$(H)$(OCAMLC) $(PKGS) -linkpkg -o $@ $(CMOS) matita.ml
@@ -194,8 +201,12 @@ distclean: clean
 	$(H)rm -rf .matita
 
 TEST_DIRS = 				\
+	legacy                          \
 	library 			\
 	tests 				\
+	dama				\
+	contribs/CoRN	 	        \
+	contribs/RELATIONAL	 	\
 	contribs/LAMBDA-TYPES 		\
 	contribs/PREDICATIVE-TOPOLOGY 	\
 	$(NULL)
@@ -298,6 +309,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 +348,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
@@ -363,12 +385,18 @@ depend:
 	$(H)$(OCAMLDEP) *.ml *.mli > .depend
 depend.opt:
 	$(H)echo "  OCAMLDEP -native"
-	$(H)$(OCAMLDEP) -native *.ml *.mli > .depend
+	$(H)$(OCAMLDEP) -native *.ml *.mli > .depend.opt
 
-ifneq ($(MAKECMDGOALS), depend)
- ifneq ($(MAKECMDGOALS), depend.opt)
-   include .depend   
- endif
+ifeq ($(MAKECMDGOALS),)
+  include .depend   
+endif
+
+ifeq ($(MAKECMDGOALS), all)
+  include .depend   
+endif
+
+ifeq ($(MAKECMDGOALS), opt)
+  include .depend.opt   
 endif
 
 %.cmi: %.mli
@@ -387,6 +415,11 @@ endif
 $(CMOS): $(LIB_DEPS)
 $(CMOS:%.cmo=%.cmx): $(LIBX_DEPS)
 
+deps.ps: deps.dot
+	dot -Tps -o $@ $<
+deps.dot: .depend
+	./dep2dot.rb < $< | tred > $@
+
 ifeq ($(MAKECMDGOALS),all)
    $(CMOS:%.cmo=%.cmi): $(LIB_DEPS)
 endif