If qemu dies during launch, set an error message (RHBZ#588851).

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 38beecd..2fde7ff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs
-# Copyright (C) 2009 Red Hat Inc.
+# Copyright (C) 2009-2010 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,27 +19,26 @@ include $(top_srcdir)/subdir-rules.mk
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = gnulib/lib hivex src daemon appliance fish po examples images \
-       gnulib/tests capitests regressions test-tool
+# Basic source for the library.
+SUBDIRS = gnulib/lib images src examples po
 
-# NB: Must build inspector directory after perl and before ocaml.
-# We could relax this if we combined the inspector_generator with
-# the ordinary generator, but that brings other problems.
-if HAVE_PERL
-SUBDIRS += perl
-endif
-
-if HAVE_INSPECTOR
-SUBDIRS += inspector
+if ENABLE_DAEMON
+SUBDIRS += daemon
 endif
-if HAVE_TOOLS
-SUBDIRS += tools
+if ENABLE_APPLIANCE
+SUBDIRS += appliance
 endif
 
-if HAVE_FUSE
-SUBDIRS += fuse
-endif
+# Tests and the test-tool.
+SUBDIRS += gnulib/tests capitests regressions test-tool
+
+# Guestfish.
+SUBDIRS += fish 
 
+# Language bindings.
+if HAVE_PERL
+SUBDIRS += perl
+endif
 if HAVE_OCAML
 SUBDIRS += ocaml ocaml/examples
 endif
@@ -56,6 +55,19 @@ if HAVE_HASKELL
 SUBDIRS += haskell
 endif
 
+# Virt-inspector, tools and guestmount.
+if HAVE_INSPECTOR
+SUBDIRS += inspector
+endif
+
+if HAVE_TOOLS
+SUBDIRS += tools
+endif
+
+if HAVE_FUSE
+SUBDIRS += fuse
+endif
+
 EXTRA_DIST = \
        $(generator_built) \
        html/pod.css \
@@ -69,7 +81,9 @@ EXTRA_DIST = \
        html/recipes.css \
        make-recipes.sh \
        contrib/README \
-       bindtests
+       bindtests \
+       .gitignore \
+       m4/.gitignore
 
 # HTML versions of manual pages.
 
@@ -81,11 +95,11 @@ html/guestfs.3.html: src/guestfs.pod \
                src/guestfs-structs.pod
        mkdir -p html
        sed \
-         -e '/@ACTIONS@/rguestfs-actions.pod' \
+         -e '/@ACTIONS@/rsrc/guestfs-actions.pod' \
          -e 's/@ACTIONS@//' \
-         -e '/@AVAILABILITY@/rguestfs-availability.pod' \
+         -e '/@AVAILABILITY@/rsrc/guestfs-availability.pod' \
          -e 's/@AVAILABILITY@//' \
-         -e '/@STRUCTS@/rguestfs-structs.pod' \
+         -e '/@STRUCTS@/rsrc/guestfs-structs.pod' \
          -e 's/@STRUCTS@//' \
          < $< | \
        pod2html \
@@ -97,7 +111,7 @@ html/guestfs.3.html: src/guestfs.pod \
 html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod
        mkdir -p html
        sed \
-         -e '/@ACTIONS@/rguestfish-actions.pod' -e 's/@ACTIONS@//' \
+         -e '/@ACTIONS@/rfish/guestfish-actions.pod' -e 's/@ACTIONS@//' \
          < $< | \
        pod2html \
          --css 'pod.css' \
@@ -116,16 +130,16 @@ HTMLFILES = \
        html/guestfs.3.html \
        html/guestfish.1.html \
        html/guestmount.1.html \
-       html/hivex.3.html \
-       html/hivexget.1.html \
-       html/hivexml.1.html \
        html/virt-cat.1.html \
        html/virt-df.1.html \
        html/virt-edit.1.html \
        html/virt-inspector.1.html \
        html/virt-list-filesystems.1.html \
+       html/virt-list-partitions.1.html \
        html/virt-ls.1.html \
+       html/virt-make-fs.1.html \
        html/virt-rescue.1.html \
+       html/virt-resize.1.html \
        html/virt-tar.1.html \
        html/virt-win-reg.1.html \
        html/recipes.html \
@@ -160,8 +174,11 @@ all-local:
            -name 'virt-edit' -o \
            -name 'virt-inspector' -o \
            -name 'virt-list-filesystems' -o \
+           -name 'virt-list-partitions' -o \
            -name 'virt-ls' -o \
+           -name 'virt-make-fs' -o \
            -name 'virt-rescue' -o \
+           -name 'virt-resize' -o \
            -name 'virt-tar' -o \
            -name 'virt-win-reg' | \
        grep -v '^perl/blib/' | \
@@ -192,3 +209,12 @@ CLEANFILES = $(fs_DATA) \
 
 clean-local:
        rm -rf initramfs
+
+# If you don't want to run all of the tests ('make check') then this
+# will just run libguestfs-test-tool for a quick check.  Note this
+# is NOT a substitute for proper testing!
+
+quickcheck:
+       LIBGUESTFS_PATH=appliance \
+       test-tool/libguestfs-test-tool \
+         --helper test-tool/libguestfs-test-tool-helper