various updates, removed proofs for now because they are the real bottleneck!!

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

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 155a36e0875e133b66c1acd2a05ddc44e1ca610f..57893de42a9f16ff6280f9df743b2d2604fd1a46 100644 (file)
--- 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,14 +37,19 @@ 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
 
-all: matita matitac cicbrowser
+updater: $(LIB_DEPS)
+       $(OCAMLC) $(PKGS) -linkpkg -o $@ updater.ml
 
 ifeq ($(HAVE_OCAMLOPT),yes)
 CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
@@ -62,9 +69,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 +103,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 "\e[0;32m[OK]\e[0m $$i") || echo "\e[0;31m[KO]\e[0m $$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 +115,7 @@ TAGS:
        cd ..; otags -vi -r ocaml/ matita/
 
 #.depend: matitaGeneratedGui.ml matitaGeneratedGui.mli *.ml *.mli
-.depend:
+depend:
        $(OCAMLDEP) *.ml *.mli > .depend
 
 include .depend