X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2FMakefile.common.in;h=8079765c4a46a631f7e4ccbdce765c91d7f64017;hb=5325734bc2e4927ed7ec146e35a6f0f2b49f50c1;hp=1afee22b80cd044bf0b4ce3b204dab3186a06786;hpb=788038150dc033d477c105a070e6b9cef524161f;p=helm.git

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index 1afee22b8..8079765c4 100644
--- 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)
@@ -80,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