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 07720651ae7034666bce184d995dd1c4e35c55f3..8079765c4a46a631f7e4ccbdce765c91d7f64017 100644 (file)
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -12,10 +12,13 @@ OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
 
 PREPROCOPTIONS = -pp camlp4o
 PREREQ =
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS) $(PREPROCOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS) $(PREPROCOPTIONS)
-OCAMLDEP = ocamlfind ocamldep $(PREPROCOPTIONS)
+OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread
+OCAMLDEBUGOPTIONS = -g
+OCAMLARCHIVEOPTIONS =
+OCAMLFIND = @OCAMLFIND@
+OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS) $(PREPROCOPTIONS)
+OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(PREPROCOPTIONS)
+OCAMLDEP = $(OCAMLFIND) ocamldep $(PREPROCOPTIONS)
 OCAMLLEX = ocamllex
 OCAMLYACC = ocamlyacc
 
@@ -31,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)
@@ -78,7 +83,13 @@ uninstall:
 backup:
        cd ..; tar cvzf $(PACKAGE)_$(shell date +%s).tar.gz $(PACKAGE)
 
-.PHONY: all opt world backup depend install uninstall clean
+ocamlinit:
+       echo "#use \"topfind\";;" > .ocamlinit
+       echo "#thread;;" >> .ocamlinit
+       for p in $(REQUIRES); do echo "#require \"$$p\";;" >> .ocamlinit; done
+       echo "#load \"$(PACKAGE).cma\";;" >> .ocamlinit
+
+.PHONY: all opt world backup depend install uninstall clean ocamlinit
 
 ifneq ($(MAKECMDGOALS), depend)
    include .depend   
@@ -91,3 +102,7 @@ endif
 ifeq ($(MAKECMDGOALS), opt)
    $(IMPLEMENTATION_FILES:%.ml=%.cmi): $(LIBRARIES_OPT)
 endif
+
+ifeq ($(MAKECMDGOALS),)
+   $(IMPLEMENTATION_FILES:%.ml=%.cmi): $(LIBRARIES)
+endif