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

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index bbf534b32..c7b250a3b 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -1,5 +1,6 @@
 
-OCAMLFIND = @OCAMLFIND@
+OCAMLPATH = ../ocaml/METAS/
+OCAMLFIND = OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH @OCAMLFIND@
 CAMLP4O = @CAMLP4O@
 LABLGLADECC = @LABLGLADECC@
 REQUIRES = @FINDLIB_REQUIRES@
@@ -20,6 +21,7 @@ CMOS =				\
 	buildTimeConf.cmo	\
 	matitaLog.cmo		\
 	matitaTypes.cmo		\
+	matitaExcPp.cmo 	\
 	matitaMisc.cmo		\
 	matitaDb.cmo		\
 	matitaSync.cmo		\
@@ -35,21 +37,26 @@ CCMOS =				\
 	buildTimeConf.cmo	\
 	matitaLog.cmo		\
 	matitaTypes.cmo		\
+	matitaExcPp.cmo 	\
 	matitaMisc.cmo		\
 	matitaDb.cmo		\
 	matitaSync.cmo		\
 	matitaDisambiguator.cmo	\
-	matitaEngine.cmo
+	matitaEngine.cmo	\
+	matitacLib.cmo
+
 
+all: matita matitac matitatop cicbrowser matitadep
 
-all: matita matitac cicbrowser
+updater: $(LIB_DEPS)
+	$(OCAMLC) $(PKGS) -linkpkg -o $@ updater.ml
 
 ifeq ($(HAVE_OCAMLOPT),yes)
 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
+opt: matita.opt matitac.opt cicbrowser.opt matitadep.opt
 else
 opt:
 	@echo "Native code compilation is disabled"
@@ -62,9 +69,17 @@ matita.opt: $(LIBX_DEPS) $(CMXS) matita.ml
 
 matitac: $(LIB_DEPS) $(CCMOS) matitac.ml
 	$(OCAMLC) $(CPKGS) -linkpkg -o $@ $(CCMOS) matitac.ml
-matitac.opt: $(LIBX_DEPS) $(CMXS) 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
@@ -86,16 +101,19 @@ matitaGeneratedGui.ml matitaGeneratedGui.mli: matita.glade
 clean:
 	rm -rf *.cma *.cmo *.cmi *.cmx *.cmxa *.a *.o	\
 		matita matita.opt matitac matitac.opt	\
-		cicbrowser cicbrowser.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/
 
-tests: matitac
-	for i in tests/*.ma; do (./matitac $$i 2> /dev/null > /dev/null && echo "[OK] $$i") || echo "[KO] $$i"; done
-.PHONY: tests
+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