X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=1949724bbbf9f27d806bc4fa80330aba41181b2d;hb=b2a3f97cd00de629e098a9d9a802cfc2669d8c91;hp=8f811ad8bbce3ed07e191b8b875962e92cdafde1;hpb=38e0e295c438adea7a8acabd21c2fd02c236cc04;p=guestfs-browser.git

diff --git a/Makefile.am b/Makefile.am
index 8f811ad..1949724 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,7 @@ EXTRA_DIST = \
 	$(SOURCES) \
 	HACKING \
 	Throbber.png Throbber.gif \
+	config.ml.in \
 	.gitignore \
 	guestfs-browser.pod \
 	guestfs-browser.1 \
@@ -113,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)
@@ -124,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
@@ -143,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
 
@@ -245,10 +244,15 @@ 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' | \
-	  sort > $@-t
+	  LANG=C sort > $@-t
 	mv $@-t $@
 
 include .depend
 
 .PHONY: depend docs
+
+# The dependencies aren't safe for parallel make (XXX fixme).
+.NOTPARALLEL: