version 0.7.1

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

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 648a7fbf65a79bceedcd24cad7db71a11d13138c..009a6cec13bc6eb1d2a3b9b8c5cf2eb320d7b735 100644 (file)
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -1,4 +1,4 @@
-
+MAKEFLAGS+=--no-print-directory
 OCAMLPATH = ../ocaml/METAS/
 OCAMLFIND = OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH @OCAMLFIND@
 CAMLP4O = @CAMLP4O@
@@ -29,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       \
@@ -47,17 +49,17 @@ 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))
@@ -90,10 +92,10 @@ matitadep: matitadep.ml $(DEPLIB_DEPS) $(CCMOS)
 matitadep.opt: matitadep.ml $(DEPLIB_DEPS) $(CCMXS)
        $(OCAMLOPT) $(DEPPKGS) -linkpkg -o $@ $(CCMXS) $<
 
-matitaclean: matitaclean.ml $(CLEANLIB_DEPS) $(CCMOS)
-       $(OCAMLC) $(CLEANPKGS) -linkpkg -o $@ $(CCMOS) $<
-matitaclean.opt: matitaclean.ml $(CLEANLIB_DEPS) $(CCMXS)
-       $(OCAMLOPT) $(CLEANPKGS) -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 $< $@
@@ -118,7 +120,8 @@ 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
@@ -126,11 +129,11 @@ distclean: clean
        rm -rf autom4te.cache/
 
 tests: matitac matitadep matitaclean
-       (cd library && make clean all)
-       (cd tests && make clean all)
+       @(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)
+       @(cd library && make clean.opt opt)
+       @(cd tests && make clean.opt opt)
 .PHONY: tests tests.opt
 
 tags: TAGS