Ignore warning 3 about String.set (for OCaml 4.02).

[guestfs-browser.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dbb23a5..1949724 100644 (file)
--- 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 \
@@ -69,6 +70,8 @@ SOURCES = \
        op_download_file.ml \
        op_file_information.mli \
        op_file_information.ml \
+       op_file_properties.mli \
+       op_file_properties.ml \
        op_inspection_dialog.mli \
        op_inspection_dialog.ml \
        op_view_file.mli \
@@ -108,12 +111,13 @@ OBJECTS = \
        op_download_dir_tarball.cmo \
        op_download_file.cmo \
        op_file_information.cmo \
+       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)
@@ -121,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
@@ -140,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
 
@@ -242,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: