ocaml 3.09 transition

[helm.git] / helm / proofChecker / Makefile

diff --git a/helm/proofChecker/Makefile b/helm/proofChecker/Makefile
index 1c3b9a174daacbc09249307f0fb6dba6eff1bab9..af48d0a5d1e941ec7d45a6831a6192fdb5be17c4 100644 (file)
--- a/helm/proofChecker/Makefile
+++ b/helm/proofChecker/Makefile
@@ -1,13 +1,16 @@
 BIN_DIR = /usr/local/bin
-REQUIRES = helm-cic_proof_checking
+REQUIRES = helm-cic_proof_checking http
 PREDICATES =
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
+OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread
+OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS) -g
 OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
 OCAMLDEP = ocamldep
 
-all: proofChecker
-opt: proofChecker.opt
+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: $(PROOFCHECKEROBJS) proofChecker
+opt: $(PROOFCHECKEROBJS:.cmo=.cmx) proofChecker.opt
 
 DEPOBJS = proofChecker.ml
 
@@ -16,18 +19,18 @@ PROOFCHECKEROBJS = proofChecker.cmo
 depend:
        $(OCAMLDEP) $(DEPOBJS) > .depend
 
-proofChecker: $(PROOFCHECKEROBJS)
+proofChecker: $(PROOFCHECKEROBJS) $(LIBRARIES)
        $(OCAMLC)  -linkpkg -o proofChecker $(PROOFCHECKEROBJS)
 
-proofChecker.opt: $(PROOFCHECKEROBJS:.cmo=.cmx)
+proofChecker.opt: $(PROOFCHECKEROBJS:.cmo=.cmx) $(LIBRARIES_OPT)
        $(OCAMLOPT) -linkpkg -o proofChecker.opt $(PROOFCHECKEROBJS:.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: