some makefile work

[helm.git] / helm / ocaml / Makefile.common.in

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index da539d460f3a4d9c2790bee888656df145797bf5..2dc345235a59af72613cfc7935b3e1b4cb1c0d7e 100644 (file)
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -1,3 +1,5 @@
+H=@
+
 # This Makefile must be included by another one defining:
 #  $PACKAGE
 #  $PREDICATES
@@ -29,11 +31,13 @@ OCAMLOPT_P4 = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(SYNTAXOPTIONS)
 
 LIBRARIES = $(shell $(OCAMLFIND) query -recursive -predicates "byte $(PREDICATES)" -format "%d/%a" $(REQUIRES))
 LIBRARIES_OPT = $(shell $(OCAMLFIND) query -recursive -predicates "native $(PREDICATES)" -format "%d/%a" $(REQUIRES))
-LIBRARIES_DEPS = $(foreach X,$(LIBRARIES),$(wildcard \
-       $(shell dirname $(X))/*.mli \
-       $(shell dirname $(X))/*.ml \
-       $(shell dirname $(X))/*/*.ml \
-       $(shell dirname $(X))/*/*.mli))
+LIBRARIES_DEPS = \
+       $(foreach X,$(filter-out /usr/lib/ocaml%,$(LIBRARIES)),\
+               $(wildcard \
+                       $(shell dirname $(X))/*.mli \
+                       $(shell dirname $(X))/*.ml \
+                       $(shell dirname $(X))/paramodulation/*.ml \
+                       $(shell dirname $(X))/paramodultation/*.mli))
 
 
 ARCHIVE = $(PACKAGE).cma
@@ -44,20 +48,22 @@ OBJECTS_TO_INSTALL = $(ARCHIVE) $(ARCHIVE_OPT) $(ARCHIVE_OPT:%.cmxa=%.a) \
 DEPEND_FILES = $(INTERFACE_FILES) $(IMPLEMENTATION_FILES)
 
 $(ARCHIVE): $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(LIBRARIES)
-       @if [ $(PACKAGE) != dummy ]; then \
-       echo OCAMLC $@;\
+       $(H)if [ $(PACKAGE) != dummy ]; then \
+       echo "  OCAMLC -a $@";\
        $(OCAMLC) $(OCAMLARCHIVEOPTIONS) -a -o $@ \
                $(IMPLEMENTATION_FILES:%.ml=%.cmo); fi
 
 $(ARCHIVE_OPT): $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(LIBRARIES_OPT)
-       @if [ $(PACKAGE) != dummy ]; then \
-       echo OCAMLOPT $@;\
+       $(H)if [ $(PACKAGE) != dummy ]; then \
+       echo "  OCAMLOPT -a $@";\
        $(OCAMLOPT) $(OCAMLARCHIVEOPTIONS) -a -o $@ \
                $(IMPLEMENTATION_FILES:%.ml=%.cmx); fi
 
 prereq: $(PREREQ)
 all: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(ARCHIVE)
+       @echo -n 
 opt: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(ARCHIVE_OPT)
+       @echo -n 
 world: all opt
 test: test.ml $(ARCHIVE)
        $(OCAMLC) $(ARCHIVE) -linkpkg -o $@ $<
@@ -74,14 +80,14 @@ $(PACKAGE).ps: .dep.dot
        ocamldot < .depend > $@
 
 %.cmi: %.mli
-       @echo OCAMLC $<
-       @$(OCAMLC) -c $<
+       @echo "  OCAMLC $<"
+       $(H)$(OCAMLC) -c $<
 %.cmo %.cmi: %.ml
-       @echo OCAMLC $<
-       @$(OCAMLC) -c $<
+       @echo "  OCAMLC $<"
+       $(H)$(OCAMLC) -c $<
 %.cmx: %.ml
-       @echo OCAMLOPT $<
-       @$(OCAMLOPT) -c $<
+       @echo "  OCAMLOPT $<"
+       $(H)$(OCAMLOPT) -c $<
 %.annot: %.ml
        $(OCAMLC) -dtypes $(PKGS) -c $<
 %.ml %.mli: %.mly