X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FMakefile.in;h=aadfd26ad1e7b8d532a90ff0f7503a9347f511f0;hb=541a200b13431987114dd3fd88ec9764cee1e772;hp=d8265a27ae95db8babcab437ef2129ee1e800849;hpb=07dde6f87105c18b28fc784b7d596a5d242e1225;p=helm.git

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index d8265a27a..aadfd26ad 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -3,54 +3,91 @@ 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		\
 	matitaGeneratedGui.cmo	\
+	matitaTypes.cmo		\
+	matitaCicMisc.cmo	\
 	matitaGtkMisc.cmo	\
+	matitaConsole.cmo	\
 	matitaGui.cmo		\
+	matitaProof.cmo		\
+	matitaDisambiguator.cmo	\
+	matitaMathView.cmo	\
+	matitaInterpreter.cmo
+# objects for matitac (batch compiler)
+CCMOS =				\
+	buildTimeConf.cmo	\
+	matitaMisc.cmo		\
 	matitaTypes.cmo		\
+	matitaCicMisc.cmo	\
 	matitaProof.cmo		\
-	matitaDisambiguator.cmo
-CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
+	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
+	rm -f cicbrowser
+	$(OCAMLC) $(PKGS) -linkpkg -o $@ $(CMOS) matita.ml
+matita.opt: $(LIBX_DEPS) $(CMXS) matita.ml
+	rm -f cicbrowser.opt
+	$(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) $< > $@
-	$(OCAMLC) -i matitaGeneratedGui.ml > matitaGeneratedGui.mli
+	$(LABLGLADECC) $< > matitaGeneratedGui.ml
+	$(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 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/