fixed

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

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index 1ca6a08c6ddb28baa7bfaa8fae741b057b6e4787..ef569ff80cf8a9121c30364bdfc933d38111df7e 100644 (file)
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -1,6 +1,5 @@
 # This Makefile must be included by another one defining:
 #  $PACKAGE
-#  $REQUIRES
 #  $PREDICATES
 #  $INTERFACE_FILES
 #  $IMPLEMENTATION_FILES
@@ -9,6 +8,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 +16,8 @@ PREREQ =
 OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -thread
 OCAMLDEBUGOPTIONS = -g
 OCAMLARCHIVEOPTIONS =
-OCAMLFIND = @OCAMLFIND@
+OCAMLFIND = OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH @OCAMLFIND@
+REQUIRES := $(shell $(OCAMLFIND) -query -format '%(requires)' helm-$(PACKAGE))
 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
@@ -38,12 +39,14 @@ OBJECTS_TO_INSTALL = $(ARCHIVE) $(ARCHIVE_OPT) $(ARCHIVE_OPT:%.cmxa=%.a) \
 DEPEND_FILES = $(INTERFACE_FILES) $(IMPLEMENTATION_FILES)
 
 $(ARCHIVE): $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(LIBRARIES)
+       if [ $(PACKAGE) != dummy ]; then \
        $(OCAMLC) $(OCAMLARCHIVEOPTIONS) -a -o $@ \
-               $(IMPLEMENTATION_FILES:%.ml=%.cmo)
+               $(IMPLEMENTATION_FILES:%.ml=%.cmo); fi
 
 $(ARCHIVE_OPT): $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(LIBRARIES_OPT)
+       if [ $(PACKAGE) != dummy ]; then \
        $(OCAMLOPT) $(OCAMLARCHIVEOPTIONS) -a -o $@ \
-               $(IMPLEMENTATION_FILES:%.ml=%.cmx)
+               $(IMPLEMENTATION_FILES:%.ml=%.cmx); fi
 
 prereq: $(PREREQ)
 all: prereq $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(ARCHIVE)
@@ -80,7 +83,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