detect and use {ocamlc,ocamlopt}.opt when they are available

[helm.git] / helm / ocaml / Makefile.common.in

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index bdcc27e86febd70a4a54324399c586c43e54b7ee..8079765c4a46a631f7e4ccbdce765c91d7f64017 100644 (file)
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -14,7 +14,8 @@ PREPROCOPTIONS = -pp camlp4o
 PREREQ =
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread
 OCAMLDEBUGOPTIONS = -g
-OCAMLFIND = ocamlfind
+OCAMLARCHIVEOPTIONS =
+OCAMLFIND = @OCAMLFIND@
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS) $(PREPROCOPTIONS)
 OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(PREPROCOPTIONS)
 OCAMLDEP = $(OCAMLFIND) ocamldep $(PREPROCOPTIONS)
@@ -33,10 +34,12 @@ OBJECTS_TO_INSTALL = $(ARCHIVE) $(ARCHIVE_OPT) $(ARCHIVE_OPT:%.cmxa=%.a) \
 DEPEND_FILES = $(INTERFACE_FILES) $(IMPLEMENTATION_FILES)
 
 $(ARCHIVE): $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(LIBRARIES)
-       $(OCAMLC) -a -linkall -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmo)
+       $(OCAMLC) $(OCAMLARCHIVEOPTIONS) -a -o $@ \
+               $(IMPLEMENTATION_FILES:%.ml=%.cmo)
 
 $(ARCHIVE_OPT): $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(LIBRARIES_OPT)
-       $(OCAMLOPT) -a -linkall -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmx)
+       $(OCAMLOPT) $(OCAMLARCHIVEOPTIONS) -a -o $@ \
+               $(IMPLEMENTATION_FILES:%.ml=%.cmx)
 
 prereq: $(PREREQ)
 all: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(ARCHIVE)