X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FMakefile;h=93a6fc6cbb8a9d7d32a0f769558e76199e942151;hb=fd0b68d4a811f2938bb045a81ad52c3d1f117e99;hp=e13b2d657deb13511e840755b47dcd872af9ced8;hpb=2d79bad1521e55c3756532bf992ddb30f767beed;p=helm.git

diff --git a/helm/software/matita/Makefile b/helm/software/matita/Makefile
index e13b2d657..93a6fc6cb 100644
--- a/helm/software/matita/Makefile
+++ b/helm/software/matita/Makefile
@@ -31,10 +31,11 @@ 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	\
@@ -46,8 +47,8 @@ CMLI =				\
 	matitaTypes.mli		\
 	matitaMisc.mli		\
 	matitamakeLib.mli	\
-	matitaInit.mli		\
 	matitaExcPp.mli 	\
+	matitaInit.mli		\
 	matitaEngine.mli	\
 	applyTransformation.mli	\
 	matitacLib.mli		\
@@ -61,7 +62,7 @@ MAINCMLI =			\
 	gragrep.mli 		\
 	$(NULL)
 # objects for matita (GTK GUI)
-ML = buildTimeConf.ml matitaGeneratedGui.ml matitaAutoGui.ml $(MLI:%.mli=%.ml)
+ML = buildTimeConf.ml matitaGeneratedGui.ml $(MLI:%.mli=%.ml)
 # objects for matitac (batch compiler)
 CML = buildTimeConf.ml $(CMLI:%.mli=%.ml)
 MAINCML = $(MAINCMLI:%.mli=%.ml)
@@ -204,6 +205,7 @@ TEST_DIRS = 				\
 	dama				\
 	contribs/CoRN	 	        \
 	contribs/RELATIONAL	 	\
+	contribs/LOGIC	       	 	\
 	contribs/LAMBDA-TYPES 		\
 	contribs/PREDICATIVE-TOPOLOGY 	\
 	$(NULL)
@@ -296,7 +298,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:
@@ -399,30 +401,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) $(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 $<"