- added doc target to generate .dot dependency graph using ocamldoc

- added start/stop targets to start/stop broker
- clean run dir/ on distclean

diff --git a/helm/hbugs/broker/Makefile b/helm/hbugs/broker/Makefile
index 32fce5032a91c653d4d10ace849be44e25ad697a..989fc3ea367b789adb21f65e4bf145793cb28618 100644 (file)
--- a/helm/hbugs/broker/Makefile
+++ b/helm/hbugs/broker/Makefile
@@ -2,10 +2,21 @@ NAME = hbugs_broker
 METADIR = ../meta
 REQUIRES = http threads hbugs-common hbugs-thread-safe
 COMMONOPTS = -package "$(REQUIRES)" -pp camlp4o
-OCAMLC = OCAMLPATH="$(METADIR)" ocamlfind ocamlc $(COMMONOPTS)
-OCAMLOPT = OCAMLPATH="$(METADIR)" ocamlfind ocamlopt $(COMMONOPTS)
-OCAMLDEP = OCAMLPATH="$(METADIR)" ocamlfind ocamldep $(COMMONOPTS)
+OCAMLFIND = ocamlfind
+OCAMLC = OCAMLPATH="$(METADIR)" $(OCAMLFIND) ocamlc $(COMMONOPTS)
+OCAMLOPT = OCAMLPATH="$(METADIR)" $(OCAMLFIND) ocamlopt $(COMMONOPTS)
+OCAMLDEP = OCAMLPATH="$(METADIR)" $(OCAMLFIND) ocamldep $(COMMONOPTS)
 MODULES = hbugs_broker_registry
+OCAMLDOC =     \
+       ocamldoc        \
+               $(shell $(OCAMLFIND) query -i-format http)      \
+               $(shell $(OCAMLFIND) query -i-format threads)   \
+               $(shell $(OCAMLFIND) query -i-format hbugs-common)      \
+               $(shell $(OCAMLFIND) query -i-format hbugs-thread-safe) \
+               $(shell $(OCAMLFIND) query -i-format hbugs-thread-safe) \
+               $(shell $(OCAMLFIND) query -i-format pxp-engine)        \
+               $(shell $(OCAMLFIND) query -i-format pcre)
+CTL = ./hbugs_broker_ctl.sh
 
 OBJS = $(patsubst %,%.cmo,$(MODULES))
 OBJSOPT = $(patsubst %,%.cmx,$(MODULES))
@@ -14,6 +25,10 @@ all: byte
 byte: $(NAME)
 opt: $(NAME).opt
 world: byte opt
+start:
+       $(CTL) start
+stop:
+       $(CTL) stop
 
 include .depend
 depend:
@@ -30,10 +45,13 @@ $(NAME): $(OBJS) $(NAME).ml
        $(OCAMLC) -linkpkg -thread -o $@ $^
 $(NAME).opt: $(OBJSOPT) $(NAME).ml
        $(OCAMLOPT) -linkpkg -thread -o $@ $^
+$(NAME).dot: *.ml *.mli ../common/*.ml ../common/*.mli
+       $(OCAMLDOC) -dot -o $@ $^
 
 distclean: clean
+       rm -f run/*
 clean:
        rm -f *.cm[aiox] *.o $(NAME){,.opt}
 
-.PHONY: all byte opt world depend clean
+.PHONY: all byte opt world depend clean start stop