X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FMakefile.in;h=c7b250a3b4789ae97a3e212e25019f7f9c205a8b;hb=0d681e06c6ced0be7f9dbce417684b082229745a;hp=9b28fd8c9e8e2a6f296fadfcddde9b60712ed54f;hpb=481992ea591bf53cba758a96e7d42e9cdce7e129;p=helm.git

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 9b28fd8c9..c7b250a3b 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -1,64 +1,142 @@
 
-OCAMLFIND = @OCAMLFIND@
+OCAMLPATH = ../ocaml/METAS/
+OCAMLFIND = OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH @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)
+OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLC_FLAGS) $(OCAML_DEBUG_FLAGS)
+OCAMLOPT = $(OCAMLFIND) opt $(OCAMLC_FLAGS)
 OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAML_FLAGS)
+# objects for matita (GTK GUI)
 CMOS =				\
 	buildTimeConf.cmo	\
-	matitaGeneratedGui.cmo	\
+	matitaLog.cmo		\
 	matitaTypes.cmo		\
+	matitaExcPp.cmo 	\
+	matitaMisc.cmo		\
+	matitaDb.cmo		\
+	matitaSync.cmo		\
+	matitaDisambiguator.cmo	\
+	matitaEngine.cmo	\
+	matitaScript.cmo	\
+	matitaGeneratedGui.cmo	\
 	matitaGtkMisc.cmo	\
-	matitaConsole.cmo	\
 	matitaGui.cmo		\
-	matitaProof.cmo		\
-	matitaDisambiguator.cmo
-CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
+	matitaMathView.cmo
+# objects for matitac (batch compiler)
+CCMOS =				\
+	buildTimeConf.cmo	\
+	matitaLog.cmo		\
+	matitaTypes.cmo		\
+	matitaExcPp.cmo 	\
+	matitaMisc.cmo		\
+	matitaDb.cmo		\
+	matitaSync.cmo		\
+	matitaDisambiguator.cmo	\
+	matitaEngine.cmo	\
+	matitacLib.cmo
 
-all: matita
+
+all: matita matitac matitatop cicbrowser matitadep
+
+updater: $(LIB_DEPS)
+	$(OCAMLC) $(PKGS) -linkpkg -o $@ updater.ml
 
 ifeq ($(HAVE_OCAMLOPT),yes)
-opt: matita.opt
+CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
+CCMXS = $(patsubst %.cmo,%.cmx,$(CCMOS))
+LIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(REQUIRES))
+LIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(REQUIRES))
+opt: matita.opt matitac.opt cicbrowser.opt matitadep.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) $(CCMXS) matitac.ml
+	$(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) matitac.ml
+
+matitatop: matitatop.ml $(LIB_DEPS) $(CCMOS)
+	$(OCAMLC) $(CPKGS) -linkpkg -o $@ toplevellib.cma $(CCMOS) $<
+
+matitadep: matitadep.ml $(LIB_DEPS) $(CCMOS)
+	$(OCAMLC) $(CPKGS) -linkpkg -o $@ $(CCMOS) $<
+matitadep.opt: matitadep.ml $(LIB_DEPS) $(CCMXS)
+	$(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) $<
+
+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
+	$(LABLGLADECC) -embed $< > 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 $<
+%.annot: %.ml
+	$(OCAMLC) -dtypes $(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	\
+		matitadep matitadep.opt
 distclean: clean
 	rm -f matitaGeneratedGui.ml matitaGeneratedGui.mli
 	rm -f config.log config.status Makefile buildTimeConf.ml
 	rm -f matita.glade.bak matita.gladep.bak
 	rm -rf autom4te.cache/
 
-depend: matitaGeneratedGui.ml matitaGeneratedGui.mli
+tests: matita
+	@scripts/do_tests.sh ./matitac /dev/null tests/*.ma
+tests.opt: matitac.opt
+	@scripts/do_tests.sh ./matitac.opt /dev/null tests/*.ma
+.PHONY: tests tests.opt
+
+tags: TAGS
+.PHONY: TAGS
+TAGS:
+	cd ..; otags -vi -r ocaml/ matita/
+
+#.depend: matitaGeneratedGui.ml matitaGeneratedGui.mli *.ml *.mli
+depend:
 	$(OCAMLDEP) *.ml *.mli > .depend
 
 include .depend
 
 .PHONY: all opt clean distclean depend
 
+$(CMOS): $(LIB_DEPS)
+$(CMOS:%.cmo=%.cmx): $(LIBX_DEPS)
+
+ifeq ($(MAKECMDGOALS),all)
+   $(CMOS:%.cmo=%.cmi): $(LIB_DEPS)
+endif
+ifeq ($(MAKECMDGOALS),)
+   $(CMOS:%.cmo=%.cmi): $(LIB_DEPS)
+endif
+ifeq ($(MAKECMDGOALS),opt)
+   $(CMOS:%.cmo=%.cmi): $(LIBX_DEPS)
+endif