More simplification due to the new conversion strategy.

[helm.git] / matita / Makefile

diff --git a/matita/Makefile b/matita/Makefile
index 1e940c3b8c5218aa1e8d5dc8c43d4ad028d398b0..1c11060d47be6837e0367c73696d959b16a41586 100644 (file)
--- a/matita/Makefile
+++ b/matita/Makefile
@@ -31,8 +31,8 @@ MLI = \
        matitaTypes.mli         \
        matitaMisc.mli          \
        matitamakeLib.mli       \
-       matitaInit.mli          \
        matitaExcPp.mli         \
+       matitaInit.mli          \
        matitaEngine.mli        \
        applyTransformation.mli \
        matitacLib.mli          \
@@ -41,14 +41,13 @@ 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          \
@@ -62,7 +61,7 @@ MAINCMLI =                    \
        gragrep.mli             \
        $(NULL)
 # objects for matita (GTK GUI)
-ML = buildTimeConf.ml matitaGeneratedGui.ml $(MLI:%.mli=%.ml)
+ML = buildTimeConf.ml matitaGeneratedGui.ml matitaAutoGui.ml $(MLI:%.mli=%.ml)
 # objects for matitac (batch compiler)
 CML = buildTimeConf.ml $(CMLI:%.mli=%.ml)
 MAINCML = $(MAINCMLI:%.mli=%.ml)
@@ -297,7 +296,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 +399,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 $<"