Fixes for -safe-string.

[guestfs-browser.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index df6a721..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 \
@@ -40,7 +41,6 @@ SOURCES = \
        cmdline.mli \
        cmdline.ml \
        config.mli \
-       config.ml \
        deviceSet.mli \
        deviceSet.ml \
        filetree.mli \
@@ -48,6 +48,12 @@ SOURCES = \
        filetree_markup.mli \
        filetree_markup.ml \
        main.ml \
+       menu_about.mli \
+       menu_about.ml \
+       menu_open_disk.mli \
+       menu_open_disk.ml \
+       menu_open_uri.mli \
+       menu_open_uri.ml \
        op_checksum_file.mli \
        op_checksum_file.ml \
        op_copy_regvalue.mli \
@@ -64,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 \
@@ -80,6 +88,9 @@ SOURCES = \
        window.mli \
        window.ml
 
+BUILT_SOURCES = \
+       config.ml
+
 # Note this list must be in dependency order.
 OBJECTS = \
        config.cmo \
@@ -100,9 +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 \
        main.cmo
 
 XOBJECTS = $(OBJECTS:.cmo=.cmx)
@@ -110,14 +125,16 @@ XOBJECTS = $(OBJECTS:.cmo=.cmx)
 bin_SCRIPTS = guestfs-browser
 
 OCAMLPACKAGES = \
-       -package libvirt,guestfs,hivex,lablgtk2,extlib,xml-light,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
-OCAMLOPTFLAGS = $(OCAMLCFLAGS)
+OCAMLOPTFLAGS = \
+       -ccopt -g \
+       $(OCAMLCFLAGS)
 OCAMLDOCFLAGS = \
        $(OCAMLPACKAGES) \
        -predicates threads \
@@ -127,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
 
@@ -163,11 +178,25 @@ icon_DATA = guestfs-browser.svg guestfs-browser-large.png guestfs-browser.png
 desktopdir = $(datadir)/applications
 desktop_DATA = guestfs-browser.desktop
 
-guestfs-browser.desktop: guestfs-browser.desktop.in
-       $(SED) "s,\@icondir\@,$(icondir),g" < $< > $@
+guestfs-browser.desktop: guestfs-browser.desktop.in Makefile
+       $(SED) "s,\@icondir\@,$(icondir),g" < $< > $@-t
+       mv $@-t $@
 
 TESTS += test-desktop-file-validate.sh
 
+# Config.  Can't use autoconf to build this because we want
+# to embed the true icondir path.
+config.ml: config.ml.in Makefile
+       < $< \
+       $(SED) \
+         -e "s,\@PACKAGE_NAME\@,$(PACKAGE_NAME),g" \
+         -e "s,\@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g" \
+         -e "s,\@HIVEXREGEDIT\@,$(HIVEXREGEDIT),g" \
+         -e "s,\@OPENER\@,$(OPENER),g" \
+         -e "s,\@icondir\@,$(icondir),g" \
+         > $@-t
+       mv $@-t $@
+
 # Man page.
 man_MANS = guestfs-browser.1
 
@@ -214,12 +243,16 @@ docs:
 depend: .depend
 
 .depend: $(wildcard *.mli) $(wildcard *.ml)
-       rm -f $@ $@-t
        $(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: