X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FMakefile.in;h=b0b1fe5227fdd24c47ed7f56f56b52cc93de85c6;hb=84d80c68bd584e2c0a2b96dc2f1d5923cea667d8;hp=428492209c6f4baacd421db3541c560eec715636;hpb=9d8e81db720417f58591ea42f72c6750b886a83d;p=helm.git

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 428492209..b0b1fe522 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -21,6 +21,7 @@ CMOS =				\
 	buildTimeConf.cmo	\
 	matitaLog.cmo		\
 	matitaTypes.cmo		\
+	matitaExcPp.cmo 	\
 	matitaMisc.cmo		\
 	matitaDb.cmo		\
 	matitaSync.cmo		\
@@ -36,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 matitaclean
 
-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 matitaclean.opt
 else
 opt:
 	@echo "Native code compilation is disabled"
@@ -66,6 +72,19 @@ matitac: $(LIB_DEPS) $(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) $<
+
+matitaclean: matitaclean.ml $(LIB_DEPS) $(CCMOS)
+	$(OCAMLC) $(CPKGS) -linkpkg -o $@ $(CCMOS) $<
+matitaclean.opt: matitaclean.ml $(LIB_DEPS) $(CCMXS)
+	$(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) $<
+
 cicbrowser: matita
 	@test -f $@ || ln -s $< $@
 cicbrowser.opt: matita.opt
@@ -87,17 +106,21 @@ 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 \
+		matitaclean matitaclean.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: matita
-	@scripts/do_tests.sh ./matitac /dev/null tests/*.ma
+tests: matitac
+	(cd library && make clean all)
+	(cd tests && make clean all)
 tests.opt: matitac.opt
-	@scripts/do_tests.sh ./matitac.opt /dev/null tests/*.ma
+	(cd library && make clean.opt opt)
+	(cd tests && make clean.opt opt)
 .PHONY: tests tests.opt
 
 tags: TAGS