X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fhbugs%2Fclient%2FMakefile;h=dc5b3d91f8e55a5179f3c71ce999ece0822ed79d;hb=e7e2a523299d807370b292b44e77f46fad1638c9;hp=4ac9af006d6ecea07c50ec4c946a1697dcdf4525;hpb=000b30e47a2765f7c94d2cc9bd08f876270a76a5;p=helm.git

diff --git a/helm/hbugs/client/Makefile b/helm/hbugs/client/Makefile
index 4ac9af006..dc5b3d91f 100644
--- a/helm/hbugs/client/Makefile
+++ b/helm/hbugs/client/Makefile
@@ -1,10 +1,14 @@
 NAME = hbugs_client
 METADIR = ../meta
-REQUIRES = lablgtk threads hbugs-common
+REQUIRES = lablgtk2 threads hbugs-common
 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
@@ -12,7 +16,7 @@ byte: $(NAME)
 opt: $(NAME).opt
 
 hbugs_client_gui.ml: hbugs_gui.glade
-	lablgladecc $< > $@
+	lablgladecc2 $< > $@
 hbugs_client_gui.cmo: hbugs_client_gui.ml
 	$(OCAMLC) -c $<
 hbugs_client_gui.cmx: hbugs_client_gui.ml
@@ -20,13 +24,13 @@ hbugs_client_gui.cmx: hbugs_client_gui.ml
 hbugs_client.cmi: hbugs_client.mli
 	$(OCAMLC) -c $<
 hbugs_client.cmo: hbugs_client.ml hbugs_client.cmi
-	$(OCAMLC) -c $<
+	$(OCAMLC) -thread -c $<
 hbugs_client.cmx: hbugs_client.ml hbugs_client.cmi
-	$(OCAMLOPT) -c $<
-$(NAME): hbugs_client_gui.cmo $(NAME).cmo main.ml
-	$(OCAMLC) -thread -package threads -linkpkg -o $@ $^
-$(NAME).opt: hbugs_client_gui.cmx $(NAME).cmx main.ml
-	$(OCAMLOPT) -thread -package threads -linkpkg -o $@ $^
+	$(OCAMLOPT) -thread -c $<
+$(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} hbugs_client_gui.ml
 distclean: clean