X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2FMakefile.common.in;h=7d9c56d6f126a6fee8eb84f9f668d736d9932da3;hb=e7e2a523299d807370b292b44e77f46fad1638c9;hp=47d02bb42867c70452ca921eb451bf96ff4d26f6;hpb=bac72fcaa876137ab7a5630e0c1badc2a627dce8;p=helm.git

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index 47d02bb42..7d9c56d6f 100644
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -10,10 +10,12 @@
 
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
 
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-OCAMLDEP = ocamldep -pp camlp4o
+PREPROCOPTIONS = -pp camlp4o
+PREREQ =
+OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
+OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS) $(PREPROCOPTIONS)
+OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS) $(PREPROCOPTIONS)
+OCAMLDEP = ocamlfind ocamldep $(PREPROCOPTIONS)
 OCAMLLEX = ocamllex
 OCAMLYACC = ocamlyacc
 
@@ -29,13 +31,14 @@ OBJECTS_TO_INSTALL = $(ARCHIVE) $(ARCHIVE_OPT) $(ARCHIVE_OPT:%.cmxa=%.a) \
 DEPEND_FILES = $(INTERFACE_FILES) $(IMPLEMENTATION_FILES)
 
 $(ARCHIVE): $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(LIBRARIES)
-	$(OCAMLC) -a -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmo)
+	$(OCAMLC) -a -linkall -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmo)
 
 $(ARCHIVE_OPT): $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(LIBRARIES_OPT)
-	$(OCAMLOPT) -a -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmx)
+	$(OCAMLOPT) -a -linkall -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmx)
 
-all: $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(ARCHIVE)
-opt: $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(ARCHIVE_OPT)
+prereq: $(PREREQ)
+all: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(ARCHIVE)
+opt: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(ARCHIVE_OPT)
 
 depend: $(DEPEND_FILES)
 	$(OCAMLDEP) $(INTERFACE_FILES) $(IMPLEMENTATION_FILES) > .depend