ocaml 3.09 transition

[helm.git] / helm / annotationHelper / Makefile

diff --git a/helm/annotationHelper/Makefile b/helm/annotationHelper/Makefile
index 2752dce0178e1dfe68f296efccf82f1b6f0f5a35..272ac3ebaa0158ee2912ad591912d7602f7d10ba 100644 (file)
--- a/helm/annotationHelper/Makefile
+++ b/helm/annotationHelper/Makefile
@@ -6,6 +6,9 @@ OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
 OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
 OCAMLDEP = ocamldep
 
+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))
+
 all: cicAnnotationHelper
 opt: cicAnnotationHelper.opt
 
@@ -16,18 +19,18 @@ CICANNOTATIONHELPEROBJS = cicAnnotationHinter.cmo cicAnnotationHelper.cmo
 depend:
        $(OCAMLDEP) $(DEPOBJS) > .depend
 
-cicAnnotationHelper: $(CICANNOTATIONHELPEROBJS)
+cicAnnotationHelper: $(CICANNOTATIONHELPEROBJS) $(LIBRARIES)
        $(OCAMLC)  -linkpkg -o cicAnnotationHelper $(CICANNOTATIONHELPEROBJS)
 
-cicAnnotationHelper.opt: $(CICANNOTATIONHELPEROBJS:.cmo=.cmx)
+cicAnnotationHelper.opt: $(CICANNOTATIONHELPEROBJS:.cmo=.cmx) $(LIBRARIES_OPT)
        $(OCAMLOPT) -linkpkg -o cicAnnotationHelper.opt $(CICANNOTATIONHELPEROBJS:.cmo=.cmx)
 
 .SUFFIXES: .ml .mli .cmo .cmi .cmx
-.ml.cmo:
+.ml.cmo: $(LIBRARIES)
        $(OCAMLC) -c $<
-.mli.cmi:
+.mli.cmi: $(LIBRARIES)
        $(OCAMLC) -c $<
-.ml.cmx:
+.ml.cmx: $(LIBRARIES_OPT)
        $(OCAMLOPT) -c $<
 
 clean: