X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2FMakefile.common.in;h=501a411dae2d96e30fb21ebd78c0fad67b70f763;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=0bae0213f41ac8f2d0eee622a00110167351f37f;hpb=3fbc7a2d1418ace187475939647553ce2b7721f6;p=helm.git

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index 0bae0213f..501a411da 100644
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -9,6 +9,7 @@
 # and put in a directory where there is a .depend file.
 
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
+OCAMLPATH = @OCAMLFIND_META_DIR@
 
 PREPROCOPTIONS = -pp camlp4o
 SYNTAXOPTIONS = -syntax camlp4o
@@ -16,7 +17,7 @@ PREREQ =
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread
 OCAMLDEBUGOPTIONS = -g
 OCAMLARCHIVEOPTIONS =
-OCAMLFIND = @OCAMLFIND@
+OCAMLFIND = OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH @OCAMLFIND@
 OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS) $(PREPROCOPTIONS)
 OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(PREPROCOPTIONS)
 OCAMLDEP = $(OCAMLFIND) ocamldep -package "camlp4,$(REQUIRES)" $(SYNTAXOPTIONS)
@@ -26,8 +27,8 @@ OCAMLYACC = ocamlyacc
 OCAMLC_P4 = $(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS) $(SYNTAXOPTIONS)
 OCAMLOPT_P4 = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(SYNTAXOPTIONS)
 
-LIBRARIES = $(shell ocamlfind query -recursive -predicates "byte $(PREDICATES)" -format "%d/%a" $(REQUIRES))
-LIBRARIES_OPT = $(shell ocamlfind query -recursive -predicates "native $(PREDICATES)" -format "%d/%a" $(REQUIRES))
+LIBRARIES = $(shell $(OCAMLFIND) query -recursive -predicates "byte $(PREDICATES)" -format "%d/%a" $(REQUIRES))
+LIBRARIES_OPT = $(shell $(OCAMLFIND) query -recursive -predicates "native $(PREDICATES)" -format "%d/%a" $(REQUIRES))
 
 
 ARCHIVE = $(PACKAGE).cma
@@ -80,7 +81,7 @@ $(IMPLEMENTATION_FILES:%.ml=%.cmo): $(LIBRARIES)
 $(IMPLEMENTATION_FILES:%.ml=%.cmx): $(LIBRARIES_OPT)
 
 clean:
-	rm -f *.cm[ioax] *.cmxa *.o *.a $(EXTRA_OBJECTS_TO_CLEAN)
+	rm -f *.cm[ioax] *.cmxa *.o *.a *.annot $(EXTRA_OBJECTS_TO_CLEAN)
 	if [ -f test ]; then rm -f test; else true; fi
 	if [ -f test.opt ]; then rm -f test.opt; else true; fi
 
@@ -118,3 +119,6 @@ endif
 ifeq ($(MAKECMDGOALS),)
    $(IMPLEMENTATION_FILES:%.ml=%.cmi): $(LIBRARIES)
 endif
+
+NULL =
+