packege dependences calculation patched

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

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index a04d1a65eb6cb30248fc81860736f199f6878781..519b2ea9a7500e3f780af088b024d72f29168e37 100644 (file)
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -5,43 +5,57 @@
 #  $INTERFACE_FILES
 #  $IMPLEMENTATION_FILES
 #  $EXTRA_OBJECTS_TO_INSTALL
+#  $EXTRA_OBJECTS_TO_CLEAN
 # and put in a directory where there is a .depend file.
 
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
 
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
+OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
 OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
 OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-OCAMLDEP = ocamldep
+OCAMLDEP = ocamldep -pp camlp4o
+OCAMLLEX = ocamllex
+OCAMLYACC = ocamlyacc
+
+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))
+OCAMLDEPOPTIONS = $(shell ocamlfind query -recursive -predicates "$(PREDICATES)" -i-format $(REQUIRES))
 
 ARCHIVE = $(PACKAGE).cma
 ARCHIVE_OPT = $(PACKAGE).cmxa
 OBJECTS_TO_INSTALL = $(ARCHIVE) $(ARCHIVE_OPT) $(ARCHIVE_OPT:%.cmxa=%.a) \
                      $(INTERFACE_FILES) $(INTERFACE_FILES:%.mli=%.cmi) \
                      $(EXTRA_OBJECTS_TO_INSTALL)
+DEPEND_FILES = $(INTERFACE_FILES) $(IMPLEMENTATION_FILES)
 
-$(ARCHIVE): $(IMPLEMENTATION_FILES:%.ml=%.cmo)
-       $(OCAMLC) -a -o $@ $^
+$(ARCHIVE): $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(LIBRARIES)
+       $(OCAMLC) -a -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmo)
 
-$(ARCHIVE_OPT): $(IMPLEMENTATION_FILES:%.ml=%.cmx)
-       $(OCAMLOPT) -a -o $@ $^
+$(ARCHIVE_OPT): $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(LIBRARIES_OPT)
+       $(OCAMLOPT) -a -o $@ $(IMPLEMENTATION_FILES:%.ml=%.cmx)
 
-all: $(ARCHIVE)
-opt: $(ARCHIVE_OPT)
+all: $(IMPLEMENTATION_FILES:%.ml=%.cmo) $(ARCHIVE)
+opt: $(IMPLEMENTATION_FILES:%.ml=%.cmx) $(ARCHIVE_OPT)
 
-depend:
-       $(OCAMLDEP) $(INTERFACE_FILES) $(IMPLEMENTATION_FILES) > .depend
+depend: $(DEPEND_FILES)
+       $(OCAMLDEP) $(OCAMLDEPOPTIONS) $(INTERFACE_FILES) $(IMPLEMENTATION_FILES) > .depend
 
-.SUFFIXES: .ml .mli .cmo .cmi .cmx
-.ml.cmo:
+.SUFFIXES: .ml .mli .cmo .cmi .cmx .mll .mly
+.ml.cmo: $(LIBRARIES)
        $(OCAMLC) -c $<
-.mli.cmi:
+.mli.cmi: $(LIBRARIES)
        $(OCAMLC) -c $<
-.ml.cmx:
+.ml.cmx: $(LIBRARIES_OPT)
        $(OCAMLOPT) -c $<
+.mly.ml:
+       $(OCAMLYACC) $<
+.mly.mli:
+       $(OCAMLYACC) $<
+.mll.ml:
+       $(OCAMLLEX) $<
 
 clean:
-       rm -f *.cm[ioax] *.cmxa *.o *.a
+       rm -f *.cm[ioax] *.cmxa *.o *.a $(EXTRA_OBJECTS_TO_CLEAN)
 
 install:
        mkdir $(OCAMLFIND_DEST_DIR)/$(PACKAGE)
@@ -53,4 +67,6 @@ uninstall:
 
 .PHONY: all opt depend install uninstall clean
 
-include .depend
+ifneq ($(MAKECMDGOALS), depend)
+   include .depend   
+endif