From: Richard W.M. Jones Date: Mon, 28 Jan 2013 10:36:19 +0000 (+0000) Subject: lablgtk2: Use auto-init, don't list gtkThread.cm* twice. X-Git-Tag: 0.2.2~1 X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=d4df1eef1b3db3334eb5844f4b7f459c634325a2;p=guestfs-browser.git lablgtk2: Use auto-init, don't list gtkThread.cm* twice. --- diff --git a/Makefile.am b/Makefile.am index 4a064f7..a6122eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -125,7 +125,7 @@ XOBJECTS = $(OBJECTS:.cmo=.cmx) bin_SCRIPTS = guestfs-browser OCAMLPACKAGES = \ - -package libvirt,guestfs,hivex,lablgtk2,extlib,xml-light,calendar,camomile,threads,bitstring,bitstring.syntax -syntax bitstring + -package libvirt,guestfs,hivex,lablgtk2,lablgtk2.auto-init,extlib,xml-light,calendar,camomile,threads,bitstring,bitstring.syntax -syntax bitstring OCAMLCFLAGS = \ -g \ -warn-error CDEFLMPSUVYZX \ @@ -144,14 +144,12 @@ OCAMLDOCFLAGS = \ if HAVE_OCAMLOPT guestfs-browser: $(XOBJECTS) $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \ - -predicates init,threads \ - -linkpkg gtkThread.cmx \ + -linkpkg \ $^ -o $@ else guestfs-browser: $(OBJECTS) $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) \ - -predicates init,threads \ - -linkpkg gtkThread.cmo \ + -linkpkg \ $^ -o $@ endif