X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FMakefile.in;h=e7f4f677b5dc06f8ef56de8ccbd3bf8d0e9ae5b5;hb=a785a3526d4dcbb6c5810ed4fb943132c9ff2d45;hp=79b3b0f75393a15a4512f7db5ee5950b61dac0d3;hpb=cc465115cdeea9819f43a5ad219b07c4f928c43a;p=helm.git

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 79b3b0f75..e7f4f677b 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -8,32 +8,41 @@ HAVE_OCAMLOPT = @HAVE_OCAMLOPT@
 OCAML_FLAGS = -package "$(REQUIRES)" -pp $(CAMLP4O)
 OCAML_THREADS_FLAGS = -thread
 OCAML_DEBUG_FLAGS =
-OCAMLC = $(OCAMLFIND) ocamlc $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS) $(OCAML_DEBUG_FLAGS)
-OCAMLOPT = $(OCAMLFIND) opt $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS) $(OCAML_DEBUG_FLAGS)
+OCAMLC_FLAGS = $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS) $(OCAML_DEBUG_FLAGS)
+OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLC_FLAGS)
+OCAMLOPT = $(OCAMLFIND) opt $(OCAMLC_FLAGS)
 OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAML_FLAGS)
 CMOS =				\
 	buildTimeConf.cmo	\
+	matitaMisc.cmo		\
 	matitaGeneratedGui.cmo	\
 	matitaTypes.cmo		\
+	matitaCicMisc.cmo	\
 	matitaGtkMisc.cmo	\
+	matitaConsole.cmo	\
 	matitaGui.cmo		\
 	matitaProof.cmo		\
-	matitaDisambiguator.cmo
-CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
+	matitaDisambiguator.cmo	\
+	matitaMathView.cmo	\
+	matitaInterpreter.cmo
+
+LIB_DEPS = $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(REQUIRES))
 
 all: matita
 
 ifeq ($(HAVE_OCAMLOPT),yes)
+CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
+LIBX_DEPS = $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(REQUIRES))
 opt: matita.opt
 else
 opt:
 	@echo "Native code compilation is disabled"
 endif
 
-matita: $(CMOS) matita.ml
-	$(OCAMLC) -linkpkg -o $@ $^
-matita.opt: $(CMXS) matita.ml
-	$(OCAMLOPT) -linkpkg -o $@ $^
+matita: $(LIB_DEPS) $(CMOS) matita.ml
+	$(OCAMLC) -linkpkg -o $@ $(CMOS) matita.ml
+matita.opt: $(LIBX_DEPS) $(CMXS) matita.ml
+	$(OCAMLOPT) -linkpkg -o $@ $(CMXS) matita.ml
 
 matitaGeneratedGui.ml matitaGeneratedGui.mli: matita.glade
 	$(LABLGLADECC) $< > matitaGeneratedGui.ml