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

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index b0b1fe522..009a6cec1 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -1,15 +1,19 @@
-
+MAKEFLAGS+=--no-print-directory
 OCAMLPATH = ../ocaml/METAS/
 OCAMLFIND = OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH @OCAMLFIND@
 CAMLP4O = @CAMLP4O@
 LABLGLADECC = @LABLGLADECC@
 REQUIRES = @FINDLIB_REQUIRES@
 CREQUIRES = @FINDLIB_CREQUIRES@
+DEPREQUIRES = @FINDLIB_DEPREQUIRES@
+CLEANREQUIRES = @FINDLIB_CLEANREQUIRES@
 HAVE_OCAMLOPT = @HAVE_OCAMLOPT@
 
 OCAML_FLAGS = -pp $(CAMLP4O)
 PKGS = -package "$(REQUIRES)"
 CPKGS = -package "$(CREQUIRES)"
+DEPPKGS = -package "$(DEPREQUIRES)"
+CLEANPKGS = -package "$(CLEANREQUIRES)"
 OCAML_THREADS_FLAGS = -thread
 OCAML_DEBUG_FLAGS = -g
 OCAMLC_FLAGS = $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS)
@@ -25,13 +29,15 @@ CMOS =				\
 	matitaMisc.cmo		\
 	matitaDb.cmo		\
 	matitaSync.cmo		\
+	matitacleanLib.cmo \
 	matitaDisambiguator.cmo	\
 	matitaEngine.cmo	\
+	matitacLib.cmo \
 	matitaScript.cmo	\
 	matitaGeneratedGui.cmo	\
 	matitaGtkMisc.cmo	\
 	matitaGui.cmo		\
-	matitaMathView.cmo
+	matitaMathView.cmo 
 # objects for matitac (batch compiler)
 CCMOS =				\
 	buildTimeConf.cmo	\
@@ -43,19 +49,25 @@ CCMOS =				\
 	matitaSync.cmo		\
 	matitaDisambiguator.cmo	\
 	matitaEngine.cmo	\
+	matitacleanLib.cmo	\
 	matitacLib.cmo
+CLEANCMOS = $(CCMOS)
 
 
 all: matita matitac matitatop cicbrowser matitadep matitaclean
 
-updater: $(LIB_DEPS)
-	$(OCAMLC) $(PKGS) -linkpkg -o $@ updater.ml
-
 ifeq ($(HAVE_OCAMLOPT),yes)
 CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
 CCMXS = $(patsubst %.cmo,%.cmx,$(CCMOS))
+CLEANCMXS = $(patsubst %.cmo,%.cmx,$(CLEANCMOS))
 LIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(REQUIRES))
 LIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(REQUIRES))
+CLIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(CREQUIRES))
+CLIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(CREQUIRES))
+DEPLIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(DEPREQUIRES))
+DEPLIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(DEPREQUIRES))
+CLEANLIB_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "byte" -format "%d/%a" $(CLEANREQUIRES))
+CLEANLIBX_DEPS := $(shell $(OCAMLFIND) query -recursive -predicates "native" -format "%d/%a" $(CLEANREQUIRES))
 opt: matita.opt matitac.opt cicbrowser.opt matitadep.opt matitaclean.opt
 else
 opt:
@@ -67,23 +79,23 @@ matita: $(LIB_DEPS) $(CMOS) matita.ml
 matita.opt: $(LIBX_DEPS) $(CMXS) matita.ml
 	$(OCAMLOPT) $(PKGS) -linkpkg -o $@ $(CMXS) matita.ml
 
-matitac: $(LIB_DEPS) $(CCMOS) matitac.ml
+matitac: $(CLIB_DEPS) $(CCMOS) matitac.ml
 	$(OCAMLC) $(CPKGS) -linkpkg -o $@ $(CCMOS) matitac.ml
-matitac.opt: $(LIBX_DEPS) $(CCMXS) matitac.ml
+matitac.opt: $(CLIBX_DEPS) $(CCMXS) matitac.ml
 	$(OCAMLOPT) $(CPKGS) -linkpkg -o $@ $(CCMXS) matitac.ml
 
-matitatop: matitatop.ml $(LIB_DEPS) $(CCMOS)
+matitatop: matitatop.ml $(CLIB_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) $<
+matitadep: matitadep.ml $(DEPLIB_DEPS) $(CCMOS)
+	$(OCAMLC) $(DEPPKGS) -linkpkg -o $@ $(CCMOS) $<
+matitadep.opt: matitadep.ml $(DEPLIB_DEPS) $(CCMXS)
+	$(OCAMLOPT) $(DEPPKGS) -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) $<
+matitaclean: matitaclean.ml $(CLEANLIB_DEPS) $(CLEANCMOS)
+	$(OCAMLC) $(CLEANPKGS) -linkpkg -o $@ $(CLEANCMOS) $<
+matitaclean.opt: matitaclean.ml $(CLEANLIB_DEPS) $(CLEANCMXS)
+	$(OCAMLOPT) $(CLEANPKGS) -linkpkg -o $@ $(CLEANCMXS) $<
 
 cicbrowser: matita
 	@test -f $@ || ln -s $< $@
@@ -108,19 +120,20 @@ clean:
 		matita matita.opt matitac matitac.opt	\
 		cicbrowser cicbrowser.opt	\
 		matitadep matitadep.opt \
-		matitaclean matitaclean.opt
+		matitaclean matitaclean.opt \
+		matitatop matitatop.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
-	(cd library && make clean all)
-	(cd tests && make clean all)
-tests.opt: matitac.opt
-	(cd library && make clean.opt opt)
-	(cd tests && make clean.opt opt)
+tests: matitac matitadep matitaclean
+	@(cd library && make clean all)
+	@(cd tests && make clean all)
+tests.opt: matitac.opt matitadep.opt matitaclean.opt
+	@(cd library && make clean.opt opt)
+	@(cd tests && make clean.opt opt)
 .PHONY: tests tests.opt
 
 tags: TAGS