slave: Use slightly modified event_callback.

[guestfs-browser.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fb632b7..1949724 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -114,10 +114,10 @@ OBJECTS = \
        op_file_properties.cmo \
        op_inspection_dialog.cmo \
        op_view_file.cmo \
+       window.cmo \
        menu_open_uri.cmo \
        menu_open_disk.cmo \
        menu_about.cmo \
-       window.cmo \
        main.cmo
 
 XOBJECTS = $(OBJECTS:.cmo=.cmx)
@@ -125,10 +125,10 @@ 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 \
+       -warn-error CDEFLMPSUVYZX-3 \
        -thread \
        $(OCAMLPACKAGES) \
        -predicates threads
@@ -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
 
@@ -247,6 +245,7 @@ depend: .depend
 .depend: $(wildcard *.mli) $(wildcard *.ml)
        $(OCAMLFIND) ocamldep $(OCAMLPACKAGES) $^ | \
          $(SED) -e 's/ *$$//' | \
+         $(SED) -e 's/[ \t]:/:/' | \
          $(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
          LANG=C sort > $@-t
        mv $@-t $@
@@ -254,3 +253,6 @@ depend: .depend
 include .depend
 
 .PHONY: depend docs
+
+# The dependencies aren't safe for parallel make (XXX fixme).
+.NOTPARALLEL: