more makefile work

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

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index b0b1fe5227fdd24c47ed7f56f56b52cc93de85c6..648a7fbf65a79bceedcd24cad7db71a11d13138c 100644 (file)
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -5,11 +5,15 @@ 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)
@@ -56,6 +60,12 @@ 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))
+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 +77,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) $(CCMOS)
+       $(OCAMLC) $(CLEANPKGS) -linkpkg -o $@ $(CCMOS) $<
+matitaclean.opt: matitaclean.ml $(CLEANLIB_DEPS) $(CCMXS)
+       $(OCAMLOPT) $(CLEANPKGS) -linkpkg -o $@ $(CCMXS) $<
 
 cicbrowser: matita
        @test -f $@ || ln -s $< $@
@@ -115,10 +125,10 @@ distclean: clean
        rm -f matita.glade.bak matita.gladep.bak
        rm -rf autom4te.cache/
 
-tests: matitac
+tests: matitac matitadep matitaclean
        (cd library && make clean all)
        (cd tests && make clean all)
-tests.opt: matitac.opt
+tests.opt: matitac.opt matitadep.opt matitaclean.opt
        (cd library && make clean.opt opt)
        (cd tests && make clean.opt opt)
 .PHONY: tests tests.opt