X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FMakefile.in;h=43a62c6f5110d85a2ee4972a4133f58ddf715911;hb=94c9255e1f3095440f4d49ea1d75443a5a343185;hp=155a36e0875e133b66c1acd2a05ddc44e1ca610f;hpb=2bf27fdf892c66e309600400a3b3ec292f796039;p=helm.git

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 155a36e08..43a62c6f5 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@
@@ -39,10 +40,14 @@ CCMOS =				\
 	matitaDb.cmo		\
 	matitaSync.cmo		\
 	matitaDisambiguator.cmo	\
-	matitaEngine.cmo
+	matitaEngine.cmo	\
+	matitacLib.cmo
+
 
+all: matita matitac matitatop cicbrowser
 
-all: matita matitac cicbrowser
+updater: $(LIB_DEPS)
+	$(OCAMLC) $(PKGS) -linkpkg -o $@ updater.ml
 
 ifeq ($(HAVE_OCAMLOPT),yes)
 CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
@@ -62,9 +67,12 @@ 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) $<
+
 cicbrowser: matita
 	@test -f $@ || ln -s $< $@
 cicbrowser.opt: matita.opt
@@ -93,9 +101,11 @@ distclean: clean
 	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
@@ -103,7 +113,7 @@ TAGS:
 	cd ..; otags -vi -r ocaml/ matita/
 
 #.depend: matitaGeneratedGui.ml matitaGeneratedGui.mli *.ml *.mli
-.depend:
+depend:
 	$(OCAMLDEP) *.ml *.mli > .depend
 
 include .depend