Branch V7_3_new_exportation merged.

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

diff --git a/helm/hbugs/client/Makefile b/helm/hbugs/client/Makefile
index 70ffca88afa3c1ec20bb9467964a53855b393c65..19491ded7ec174af636dd9be416be9e0ce2911ed 100644 (file)
--- a/helm/hbugs/client/Makefile
+++ b/helm/hbugs/client/Makefile
@@ -5,17 +5,21 @@ PREDICATES = glade init
 COMMONOPTS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
 OCAMLC = OCAMLPATH="$(METADIR)" ocamlfind ocamlc $(COMMONOPTS)
 OCAMLOPT = OCAMLPATH="$(METADIR)" ocamlfind ocamlopt $(COMMONOPTS)
+OCAMLFIND = ocamlfind
+
+DEPS = $(shell $(OCAMLFIND) query -recursive -predicates byte -format "%d/%a" $(REQUIRES))
+DEPSOPT = $(shell $(OCAMLFIND) query -recursive -predicates native -format "%d/%a" $(REQUIRES))
 
 all: byte
 world: byte opt
 byte: $(NAME)
 opt: $(NAME).opt
 
-# gui.ml: hbugs_gui.glade
-#      lablgladecc $< > $@
-gui.cmo: gui.ml
+hbugs_client_gui.ml: hbugs_gui.glade
+       lablgladecc $< > $@
+hbugs_client_gui.cmo: hbugs_client_gui.ml
        $(OCAMLC) -c $<
-gui.cmx: gui.ml
+hbugs_client_gui.cmx: hbugs_client_gui.ml
        $(OCAMLOPT) -c $<
 hbugs_client.cmi: hbugs_client.mli
        $(OCAMLC) -c $<
@@ -23,11 +27,11 @@ hbugs_client.cmo: hbugs_client.ml hbugs_client.cmi
        $(OCAMLC) -c $<
 hbugs_client.cmx: hbugs_client.ml hbugs_client.cmi
        $(OCAMLOPT) -c $<
-$(NAME): gui.cmo $(NAME).cmo
-       $(OCAMLC) -thread -package threads -linkpkg -o $@ $^
-$(NAME).opt: gui.cmx $(NAME).cmx
-       $(OCAMLOPT) -thread -package threads -linkpkg -o $@ $^
+$(NAME): $(DEPS) hbugs_client_gui.cmo $(NAME).cmo main.ml
+       $(OCAMLC) -thread -package threads -linkpkg -o $@ hbugs_client_gui.cmo $(NAME).cmo main.ml
+$(NAME).opt: $(DEPSOPT) hbugs_client_gui.cmx $(NAME).cmx main.ml
+       $(OCAMLOPT) -thread -package threads -linkpkg -o $@ hbugs_client_gui.cmx $(NAME).cmx main.ml
 clean:
-#      rm -f *.cm[aixo] *.cmxa *.[oa] $(NAME){,.opt} gui.ml
-       rm -f *.cm[aixo] *.cmxa *.[oa] $(NAME){,.opt}
+       rm -f *.cm[aixo] *.cmxa *.[oa] $(NAME){,.opt} hbugs_client_gui.ml
+distclean: clean
 .PHONY: all world byte opt clean