bugfix: FreshNameGenerator uses the type checker on mk_fresh_name

[helm.git] / helm / matita / Makefile.in

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index d8265a27ae95db8babcab437ef2129ee1e800849..e7f4f677b5dc06f8ef56de8ccbd3bf8d0e9ae5b5 100644 (file)
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -8,35 +8,44 @@ 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           \
-       matitaTypes.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) $< > $@
+       $(LABLGLADECC) $< > matitaGeneratedGui.ml
        $(OCAMLC) -i matitaGeneratedGui.ml > matitaGeneratedGui.mli
 
 %.cmi: %.mli
@@ -50,7 +59,7 @@ clean:
        rm -rf *.cma *.cmo *.cmi *.cmx *.cmxa *.a *.o matita matita.opt
 distclean: clean
        rm -f matitaGeneratedGui.ml matitaGeneratedGui.mli
-       rm -f config.log config.status configure Makefile buildTimeConf.ml
+       rm -f config.log config.status Makefile buildTimeConf.ml
        rm -f matita.glade.bak matita.gladep.bak
        rm -rf autom4te.cache/