Dependencies from libraries now checked.

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:

diff --git a/helm/fix_params/Makefile b/helm/fix_params/Makefile
index 24f3d4860ed0f12fb08ccc2875adc35fb87575f6..29a6a968285410f36ec0cabb4d38455ef8542dff 100644 (file)
--- a/helm/fix_params/Makefile
+++ b/helm/fix_params/Makefile
@@ -6,6 +6,9 @@ OCAMLFIND = ocamlfind
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS)
 OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS)
 
+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: fix_params
 opt: fix_params.opt
 
@@ -16,18 +19,18 @@ FIXPARAMSOBJS = cic2Xml.cmo cicFindParameters.cmo fix_params.cmo
 depend:
        $(OCAMLDEP) $(DEPOBJS) > .depend
 
-fix_params: $(FIXPARAMSOBJS)
+fix_params: $(FIXPARAMSOBJS) $(LIBRARIES)
        $(OCAMLC) -linkpkg -o fix_params $(FIXPARAMSOBJS)
 
-fix_params.opt: $(FIXPARAMSOBJS:.cmo=.cmx)
+fix_params.opt: $(FIXPARAMSOBJS:.cmo=.cmx) $(LIBRARIES_OPT)
        $(OCAMLOPT) -linkpkg -o fix_params.opt $(FIXPARAMSOBJS:.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:

diff --git a/helm/metadata/create2/mk_forward/Makefile b/helm/metadata/create2/mk_forward/Makefile
index 921486dbdb586a26f3e538923a374384e4d454ca..f24c47a669f0ef8fb50be8d8247053b40ccb2ee0 100644 (file)
--- a/helm/metadata/create2/mk_forward/Makefile
+++ b/helm/metadata/create2/mk_forward/Makefile
@@ -1,4 +1,3 @@
-BIN_DIR = /usr/local/bin
 REQUIRES = helm-xml helm-cic_proof_checking
 PREDICATES = miniReduction
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
@@ -7,6 +6,9 @@ OCAMLFIND = ocamlfind
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS)
 OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS)
 
+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: mk_forward
 opt: mk_forward.opt
 
@@ -17,18 +19,18 @@ MKFORWARDOBJS = mk_forward.cmo
 depend:
        $(OCAMLDEP) $(DEPOBJS) > .depend
 
-mk_forward: $(MKFORWARDOBJS)
+mk_forward: $(MKFORWARDOBJS) $(LIBRARIES)
        $(OCAMLC) -linkpkg -o mk_forward $(MKFORWARDOBJS)
 
-mk_forward.opt: $(MKFORWARDOBJS:.cmo=.cmx)
+mk_forward.opt: $(MKFORWARDOBJS:.cmo=.cmx) $(LIBRARIES_OPT)
        $(OCAMLOPT) -linkpkg -o mk_forward.opt $(MKFORWARDOBJS:.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:

diff --git a/helm/metadata/create2/touch/Makefile b/helm/metadata/create2/touch/Makefile
index 5296fa723a0643c9d313c35b3635bc2485920d5f..636a804daba51c14f70aba9db3c6cd105ff927c7 100644 (file)
--- a/helm/metadata/create2/touch/Makefile
+++ b/helm/metadata/create2/touch/Makefile
@@ -6,6 +6,9 @@ OCAMLFIND = ocamlfind
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLOPTIONS)
 OCAMLOPT = $(OCAMLFIND) ocamlopt $(OCAMLOPTIONS)
 
+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: touch
 opt: touch.opt
 
@@ -16,18 +19,18 @@ TOUCHOBJS = touch.cmo
 depend:
        $(OCAMLDEP) $(DEPOBJS) > .depend
 
-touch: $(TOUCHOBJS)
+touch: $(TOUCHOBJS) $(LIBRARIES)
        $(OCAMLC) -linkpkg -o touch $(TOUCHOBJS)
 
-touch.opt: $(TOUCHOBJS:.cmo=.cmx)
+touch.opt: $(TOUCHOBJS:.cmo=.cmx) $(LIBRARIES_OPT)
        $(OCAMLOPT) -linkpkg -o touch.opt $(TOUCHOBJS:.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: