rebuilt against ocaml 3.08.3

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

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 9b28fd8c9e8e2a6f296fadfcddde9b60712ed54f..90a8a2a41559f5a9d5fd2672b25e5ab8891ebaac 100644 (file)
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -3,52 +3,89 @@ OCAMLFIND = @OCAMLFIND@
 CAMLP4O = @CAMLP4O@
 LABLGLADECC = @LABLGLADECC@
 REQUIRES = @FINDLIB_REQUIRES@
+CREQUIRES = @FINDLIB_CREQUIRES@
 HAVE_OCAMLOPT = @HAVE_OCAMLOPT@
 
-OCAML_FLAGS = -package "$(REQUIRES)" -pp $(CAMLP4O)
+OCAML_FLAGS = -pp $(CAMLP4O)
+PKGS = -package "$(REQUIRES)"
+CPKGS = -package "$(CREQUIRES)"
 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)
+OCAML_DEBUG_FLAGS = -g
+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)
+# objects for matita (GTK GUI)
 CMOS =                         \
        buildTimeConf.cmo       \
+       matitaMisc.cmo          \
+       matitaDb.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   \
+       matitaScript.cmo
+# objects for matitac (batch compiler)
+CCMOS =                                \
+       buildTimeConf.cmo       \
+       matitaMisc.cmo          \
+       matitaDb.cmo            \
+       matitaTypes.cmo         \
+       matitaCicMisc.cmo       \
+       matitaProof.cmo         \
+       matitaDisambiguator.cmo \
+       matitaInterpreter.cmo
 
-all: matita
+LIB_DEPS = $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(REQUIRES))
+
+all: matita matitac cicbrowser
 
 ifeq ($(HAVE_OCAMLOPT),yes)
-opt: matita.opt
+CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
+CCMXS = $(patsubst %.cmo,%.cmx,$(CCMOS))
+LIBX_DEPS = $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(REQUIRES))
+opt: matita.opt matitac.opt cicbrowser.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) $(PKGS) -linkpkg -o $@ $(CMOS) matita.ml
+matita.opt: $(LIBX_DEPS) $(CMXS) matita.ml
+       $(OCAMLOPT) $(PKGS) -linkpkg -o $@ $(CMXS) matita.ml
+
+matitac: $(LIB_DEPS) $(CCMOS) matitac.ml
+       $(OCAMLC) $(CPKGS) -linkpkg -o $@ $(CCMOS) matitac.ml
+matitac.opt: $(LIBX_DEPS) $(CMXS) matitac.ml
+       $(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) matitac.ml
+
+cicbrowser: matita
+       @test -f $@ || ln -s $< $@
+cicbrowser.opt: matita.opt
+       @test -f $@ || ln -s $< $@
 
 matitaGeneratedGui.ml matitaGeneratedGui.mli: matita.glade
        $(LABLGLADECC) $< > matitaGeneratedGui.ml
-       $(OCAMLC) -i matitaGeneratedGui.ml > matitaGeneratedGui.mli
+       $(OCAMLC) $(PKGS) -i matitaGeneratedGui.ml > matitaGeneratedGui.mli
 
 %.cmi: %.mli
-       $(OCAMLC) -c $<
+       $(OCAMLC) $(PKGS) -c $<
 %.cmo %.cmi: %.ml
-       $(OCAMLC) -c $<
+       $(OCAMLC) $(PKGS) -c $<
 %.cmx: %.ml
-       $(OCAMLOPT) -c $<
+       $(OCAMLOPT) $(PKGS) -c $<
 
 clean:
-       rm -rf *.cma *.cmo *.cmi *.cmx *.cmxa *.a *.o matita matita.opt
+       rm -rf *.cma *.cmo *.cmi *.cmx *.cmxa *.a *.o   \
+               matita matita.opt matitac matitac.opt   \
+               cicbrowser cicbrowser.opt
 distclean: clean
        rm -f matitaGeneratedGui.ml matitaGeneratedGui.mli
        rm -f config.log config.status Makefile buildTimeConf.ml