X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fhbugs%2Fclient%2FMakefile;h=186931e98211309178083c2fe98fc4cc52dd29c7;hb=970ba0021a992efe25ec374875dc127ff236cc74;hp=70ffca88afa3c1ec20bb9467964a53855b393c65;hpb=58cc9aa288286beb79f78ce4546d5a4bebde54e5;p=helm.git

diff --git a/helm/hbugs/client/Makefile b/helm/hbugs/client/Makefile
index 70ffca88a..186931e98 100644
--- a/helm/hbugs/client/Makefile
+++ b/helm/hbugs/client/Makefile
@@ -1,33 +1,38 @@
 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
 byte: $(NAME)
 opt: $(NAME).opt
 
-# gui.ml: hbugs_gui.glade
-# 	lablgladecc $< > $@
-gui.cmo: gui.ml
+hbugs_client_gui.ml: hbugs_gui.glade
+	lablgladecc2 $< > $@.tmp
+	mv $@.tmp $@
+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 $<
 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): gui.cmo $(NAME).cmo
-	$(OCAMLC) -thread -package threads -linkpkg -o $@ $^
-$(NAME).opt: gui.cmx $(NAME).cmx
-	$(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} 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