Debugging stuff removed.

[helm.git] / helm / hbugs / broker / Makefile

diff --git a/helm/hbugs/broker/Makefile b/helm/hbugs/broker/Makefile
index 989fc3ea367b789adb21f65e4bf145793cb28618..fe1bf71e95ca0c8db7612101d1f11a81f562061d 100644 (file)
--- a/helm/hbugs/broker/Makefile
+++ b/helm/hbugs/broker/Makefile
@@ -3,9 +3,9 @@ METADIR = ../meta
 REQUIRES = http threads hbugs-common hbugs-thread-safe
 COMMONOPTS = -package "$(REQUIRES)" -pp camlp4o
 OCAMLFIND = ocamlfind
-OCAMLC = OCAMLPATH="$(METADIR)" $(OCAMLFIND) ocamlc $(COMMONOPTS)
-OCAMLOPT = OCAMLPATH="$(METADIR)" $(OCAMLFIND) ocamlopt $(COMMONOPTS)
-OCAMLDEP = OCAMLPATH="$(METADIR)" $(OCAMLFIND) ocamldep $(COMMONOPTS)
+OCAMLC = $(OCAMLFIND) ocamlc $(COMMONOPTS)
+OCAMLOPT = $(OCAMLFIND) ocamlopt $(COMMONOPTS)
+OCAMLDEP = $(OCAMLFIND) ocamldep $(COMMONOPTS)
 MODULES = hbugs_broker_registry
 OCAMLDOC =     \
        ocamldoc        \
@@ -20,6 +20,8 @@ CTL = ./hbugs_broker_ctl.sh
 
 OBJS = $(patsubst %,%.cmo,$(MODULES))
 OBJSOPT = $(patsubst %,%.cmx,$(MODULES))
+DEPS = $(shell $(OCAMLFIND) query -recursive -predicates byte -format "%d/%a" $(REQUIRES))
+DEPSOPT = $(shell $(OCAMLFIND) query -recursive -predicates native -format "%d/%a" $(REQUIRES))
 
 all: byte
 byte: $(NAME)
@@ -41,6 +43,8 @@ depend:
 %.cmx: %.ml %.cmi
        $(OCAMLOPT) -c $<
 include Makefile.overrides
+$(OBJS): $(DEPS)
+$(OBJSOPT): $(DEPSOPT)
 $(NAME): $(OBJS) $(NAME).ml
        $(OCAMLC) -linkpkg -thread -o $@ $^
 $(NAME).opt: $(OBJSOPT) $(NAME).ml