- added/moved METAs in meta/ dir

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

diff --git a/helm/hbugs/broker/Makefile b/helm/hbugs/broker/Makefile
index 07d255780281823d48f848389aa5ff69240ae10c..32fce5032a91c653d4d10ace849be44e25ad697a 100644 (file)
--- a/helm/hbugs/broker/Makefile
+++ b/helm/hbugs/broker/Makefile
@@ -1,18 +1,14 @@
 NAME = hbugs_broker
-REQUIRES = http threads hbugs-common
-COMMONDIR = ../common
+METADIR = ../meta
+REQUIRES = http threads hbugs-common hbugs-thread-safe
 COMMONOPTS = -package "$(REQUIRES)" -pp camlp4o
-OCAMLC = ocamlfind ocamlc -I $(COMMONDIR) $(COMMONOPTS)
-OCAMLOPT = ocamlfind ocamlopt -I $(COMMONDIR) $(COMMONOPTS)
-OCAMLDEP = ocamlfind ocamldep $(COMMONOPTS)
+OCAMLC = OCAMLPATH="$(METADIR)" ocamlfind ocamlc $(COMMONOPTS)
+OCAMLOPT = OCAMLPATH="$(METADIR)" ocamlfind ocamlopt $(COMMONOPTS)
+OCAMLDEP = OCAMLPATH="$(METADIR)" ocamlfind ocamldep $(COMMONOPTS)
 MODULES = hbugs_broker_registry
-COMMON_MODULES =       \
-       hbugs_types threadSafe hbugs_misc hbugs_id_generator hbugs_messages
 
 OBJS = $(patsubst %,%.cmo,$(MODULES))
 OBJSOPT = $(patsubst %,%.cmx,$(MODULES))
-COMMON_OBJS = $(patsubst %,$(COMMONDIR)/%.cmo,$(COMMON_MODULES))
-COMMON_OBJSOPT = $(patsubst %,$(COMMONDIR)/%.cmx,$(COMMON_MODULES))
 
 all: byte
 byte: $(NAME)
@@ -24,16 +20,16 @@ depend:
        $(OCAMLDEP) *.ml *.mli > .depend
 
 %.cmi: %.mli
-       OCAMLPATH=".." $(OCAMLC) -c $<
+       $(OCAMLC) -c $<
 %.cmo: %.ml %.cmi
-       OCAMLPATH=".." $(OCAMLC) -c $<
+       $(OCAMLC) -c $<
 %.cmx: %.ml %.cmi
-       OCAMLPATH=".." $(OCAMLOPT) -c $<
+       $(OCAMLOPT) -c $<
 include Makefile.overrides
 $(NAME): $(OBJS) $(NAME).ml
-       OCAMLPATH=".." $(OCAMLC) -linkpkg -thread -o $@ $(COMMON_OBJS) $^
+       $(OCAMLC) -linkpkg -thread -o $@ $^
 $(NAME).opt: $(OBJSOPT) $(NAME).ml
-       OCAMLPATH=".." $(OCAMLOPT) -linkpkg -thread -o $@ $(COMMON_OBJSOPT) $^
+       $(OCAMLOPT) -linkpkg -thread -o $@ $^
 
 distclean: clean
 clean: