added -thread option where needed to make new findlib happy

diff --git a/helm/hbugs/client/Makefile b/helm/hbugs/client/Makefile
index 5cb7c6c6d884c9144b9e3af1c37a868572aa58d8..dc5b3d91f8e55a5179f3c71ce999ece0822ed79d 100644 (file)
--- a/helm/hbugs/client/Makefile
+++ b/helm/hbugs/client/Makefile
@@ -24,9 +24,9 @@ hbugs_client_gui.cmx: hbugs_client_gui.ml
 hbugs_client.cmi: hbugs_client.mli
        $(OCAMLC) -c $<
 hbugs_client.cmo: hbugs_client.ml hbugs_client.cmi
-       $(OCAMLC) -c $<
+       $(OCAMLC) -thread -c $<
 hbugs_client.cmx: hbugs_client.ml hbugs_client.cmi
-       $(OCAMLOPT) -c $<
+       $(OCAMLOPT) -thread -c $<
 $(NAME): $(DEPS) hbugs_client_gui.cmo $(NAME).cmo main.ml
        $(OCAMLC) -thread -package threads -linkpkg -o $@ hbugs_client_gui.cmo $(NAME).cmo main.ml
 $(NAME).opt: $(DEPSOPT) hbugs_client_gui.cmx $(NAME).cmx main.ml

diff --git a/helm/hbugs/common/Makefile.overrides b/helm/hbugs/common/Makefile.overrides
index f1ce521218822256ef15a04b1fecd0f90a37efc0..62506b5052df8edc5d5df2394358724e36e6d0aa 100644 (file)
--- a/helm/hbugs/common/Makefile.overrides
+++ b/helm/hbugs/common/Makefile.overrides
@@ -1,6 +1,6 @@
 hbugs_types.cmi hbugs_types.cmo: hbugs_types.ml
        $(OCAMLC) -c $<
 threadSafe.cmi threadSafe.cmo: threadSafe.ml
-       $(OCAMLC) -package threads -c $<
+       $(OCAMLC) -thread -package threads -c $<
 threadSafe.cmx: threadSafe.ml threadSafe.cmi
-       $(OCAMLOPT) -package threads -c $<
+       $(OCAMLOPT) -thread -package threads -c $<

diff --git a/helm/hbugs/tutors/Makefile b/helm/hbugs/tutors/Makefile
index fed96f9668c848a4a02d93ed5e96246f4b73eee8..f0044dfc6ace1b922dd646705538c605097b171c 100644 (file)
--- a/helm/hbugs/tutors/Makefile
+++ b/helm/hbugs/tutors/Makefile
@@ -4,8 +4,8 @@ REQUIRES = threads hbugs-common helm-cic_proof_checking helm-getter \
         helm-mathql helm-mathql_interpreter helm-tactics  
 COMMONOPTS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
 OCAMLFIND = ocamlfind
-OCAMLC = $(OCAMLFIND) ocamlc $(COMMONOPTS)
-OCAMLOPT = $(OCAMLFIND) opt $(COMMONOPTS)
+OCAMLC = $(OCAMLFIND) ocamlc -thread $(COMMONOPTS)
+OCAMLOPT = $(OCAMLFIND) opt -thread $(COMMONOPTS)
 OCAMLDEP = $(OCAMLFIND) ocamldep -package "$(REQUIRES)"
 LINK_OPTIONS = -thread -package threads -linkpkg
 TUTORS_TEMPLATE = hbugs_tutor.TPL.ml