From f9b4235fda2f3d390ef8fa5ddee2d4e2a0f377ae Mon Sep 17 00:00:00 2001
From: Claudio Sacerdoti Coen <claudio.sacerdoticoen@unibo.it>
Date: Mon, 3 Dec 2001 15:33:40 +0000
Subject: [PATCH] Dependencies from libraries now checked.

---
 helm/annotationHelper/Makefile            | 13 ++++++++-----
 helm/fix_params/Makefile                  | 13 ++++++++-----
 helm/metadata/create2/mk_forward/Makefile | 14 ++++++++------
 helm/metadata/create2/touch/Makefile      | 13 ++++++++-----
 4 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/helm/annotationHelper/Makefile b/helm/annotationHelper/Makefile
index 2752dce01..272ac3eba 100644
--- 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 24f3d4860..29a6a9682 100644
--- 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 921486dbd..f24c47a66 100644
--- 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 5296fa723..636a804da 100644
--- 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:
-- 
2.39.2