X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FMakefile;h=ad5a18892524466da938e2e6f8e9d0714adb3ee1;hb=d6c41ecd6b4d6944becbef2f7f6a625c51d8867c;hp=1e940c3b8c5218aa1e8d5dc8c43d4ad028d398b0;hpb=5d1cece5f42866b34566a0f616aa3b46a77359a3;p=helm.git

diff --git a/helm/software/matita/Makefile b/helm/software/matita/Makefile
index 1e940c3b8..ad5a18892 100644
--- a/helm/software/matita/Makefile
+++ b/helm/software/matita/Makefile
@@ -5,7 +5,8 @@ include ../Makefile.defs
 NULL =
 H=@
 
-OCAML_FLAGS = -pp $(CAMLP4O)
+OCAML_FLAGS = -pp $(CAMLP5O) -rectypes
+OCAMLDEP_FLAGS = -pp $(CAMLP5O) 
 PKGS = -package "$(MATITA_REQUIRES)"
 CPKGS = -package "$(MATITA_CREQUIRES)"
 OCAML_THREADS_FLAGS = -thread
@@ -15,7 +16,7 @@ OCAML_DEBUG_FLAGS = -g
 OCAMLC_FLAGS = $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS)
 OCAMLC = $(OCAMLFIND) ocamlc$(OCAML_PROF) $(OCAMLC_FLAGS) $(OCAML_DEBUG_FLAGS)
 OCAMLOPT = $(OCAMLFIND) opt $(OCAMLC_FLAGS) $(OCAMLOPT_DEBUG_FLAGS)
-OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAML_FLAGS)
+OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAMLDEP_FLAGS)
 INSTALL_PROGRAMS= matita matitac
 INSTALL_PROGRAMS_LINKS_MATITA= cicbrowser 
 INSTALL_PROGRAMS_LINKS_MATITAC= matitadep matitamake matitaclean matitaprover matitawiki
@@ -31,24 +32,24 @@ MLI = \
 	matitaTypes.mli		\
 	matitaMisc.mli		\
 	matitamakeLib.mli	\
-	matitaInit.mli		\
 	matitaExcPp.mli 	\
+	matitaInit.mli		\
 	matitaEngine.mli	\
 	applyTransformation.mli	\
+	matitaAutoGui.mli	\
 	matitacLib.mli		\
 	matitaprover.mli        \
 	matitaGtkMisc.mli	\
 	matitaScript.mli	\
 	matitaMathView.mli 	\
 	matitaGui.mli		\
-	matitaAutoGui.cmo		\
 	$(NULL)
 CMLI =				\
 	matitaTypes.mli		\
 	matitaMisc.mli		\
 	matitamakeLib.mli	\
-	matitaInit.mli		\
 	matitaExcPp.mli 	\
+	matitaInit.mli		\
 	matitaEngine.mli	\
 	applyTransformation.mli	\
 	matitacLib.mli		\
@@ -205,6 +206,7 @@ TEST_DIRS = 				\
 	dama				\
 	contribs/CoRN	 	        \
 	contribs/RELATIONAL	 	\
+	contribs/LOGIC	       	 	\
 	contribs/LAMBDA-TYPES 		\
 	contribs/PREDICATIVE-TOPOLOGY 	\
 	$(NULL)
@@ -234,8 +236,6 @@ cleantests.opt: $(foreach d,$(TEST_DIRS_OPT),$(d)-cleantests-opt)
 ifeq ($(DISTRIBUTED),yes)
 
 
-MATITA_CFLAGS = #-nodb
-
 dist_library: install_preliminaries dist_library@standard-library
 dist_library@%: 
 	$(H)echo "MATITAMAKE init $*"
@@ -297,7 +297,7 @@ endif
 		ln -fs matita $(WHERE)/$$p;\
 	done
 	$(H)cp -a library/ $(WHERE)/ma/standard-library
-	$(H)cp -a contribs/ $(WHERE)/ma/
+	#$(H)cp -a contribs/ $(WHERE)/ma/
 	$(H)touch install_preliminaries.stamp
 
 uninstall:
@@ -400,30 +400,40 @@ depend.opt:
 	$(H)$(OCAMLDEP) -native *.ml *.mli > .depend.opt
 
 # this should be sligtly better, since should work with 'make all opt'
-ifneq (,$(findstring all,$(MAKECMDGOALS)))
+MAKECMDGOALS_DELIM=$(addprefix _x_,$(addsuffix _x_,$(MAKECMDGOALS)))
+ifneq (,$(findstring _x_all_x_,$(MAKECMDGOALS_DELIM)))
   # if we 'make all opt' the deps for 'all' should be fine also for opt
-	# if we 'make opt all' it should not work...
+  # if we 'make opt all' it should not work...
+  INCLUDE_MANDATORY=yes
   TO_INCLUDE+=.depend
   TO_DEPEND_ON=$(LIB_DEPS)
-else ifneq (,$(findstring opt,$(MAKECMDGOALS)))
+else ifneq (,$(findstring _x_opt_x_,$(MAKECMDGOALS_DELIM)))
+  INCLUDE_MANDATORY=yes
   TO_INCLUDE+=.depend.opt
   TO_DEPEND_ON=$(LIBX_DEPS)
-else ifneq (,$(findstring world,$(MAKECMDGOALS)))
+else ifneq (,$(findstring _x_world_x_,$(MAKECMDGOALS_DELIM)))
   ifeq ($(HAVE_OCAMLOPT),yes)
+    INCLUDE_MANDATORY=yes
     TO_INCLUDE+=.depend.opt
     TO_DEPEND_ON=$(LIBX_DEPS)
   else
+    INCLUDE_MANDATORY=yes
     TO_INCLUDE+=.depend
     TO_DEPEND_ON=$(LIB_DEPS)
   endif
 else
   TO_INCLUDE+=.depend
+  INCLUDE_MANDATORY=no
   TO_DEPEND_ON=$(LIB_DEPS)
 endif
 
-$(MLI:%.mli=%.cmi): $(TO_DEPEND_ON)
+$(MLI:%.mli=%.cmi) $(ML:%.ml=%.cmo) $(ML:%.ml=%.cmx): $(TO_DEPEND_ON)
 
-include $(TO_INCLUDE)
+ifeq (no,$(INCLUDE_MANDATORY))
+  -include $(TO_INCLUDE)
+else
+  include $(TO_INCLUDE)
+endif
 
 %.cmi: %.mli
 	$(H)echo "  OCAMLC $<"