package dependences calulation fixed

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

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index 62df6201cad1f59b4f7094308fbef661da0c2c5b..635f37fea62fdeed509ca9e2c59068764719abc2 100644 (file)
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -13,13 +13,13 @@ OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
 OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
 OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-OCAMLDEP = ocamldep
+OCAMLDEP = ocamldep -pp camlp4o
 OCAMLLEX = ocamllex
 OCAMLYACC = ocamlyacc
 
 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))
-
+OCAMLDEPOPTIONS = $(shell ocamlfind query -recursive -predicates "$(PREDICATES)" -i-format $(REQUIRES))
 
 ARCHIVE = $(PACKAGE).cma
 ARCHIVE_OPT = $(PACKAGE).cmxa
@@ -38,7 +38,7 @@ all: $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(ARCHIVE)
 opt: $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(ARCHIVE_OPT)
 
 depend: $(DEPEND_FILES)
-       $(OCAMLDEP) $(INTERFACE_FILES) $(IMPLEMENTATION_FILES) > .depend
+       $(OCAMLDEP) $(OCAMLDEPOPTIONS) $(INTERFACE_FILES) $(IMPLEMENTATION_FILES) > .depend
 
 .SUFFIXES: .ml .mli .cmo .cmi .cmx .mll .mly
 .ml.cmo: $(LIBRARIES)