X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=350c579a6d278afe4b03a1b734e7f6565b037531;hb=be1419a442d9936e737fb2ca6f0fdba36a048964;hp=613805299728b40f763952275f615d535a1aef97;hpb=fac15924f59a076c903d453d20305e00e1ae258a;p=libguestfs.git

diff --git a/Makefile.am b/Makefile.am
index 6138052..350c579 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,14 +13,17 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/subdir-rules.mk
 
 ACLOCAL_AMFLAGS = -I m4
 
+# Gnulib - must be built and tested before the library.
+SUBDIRS = gnulib/lib gnulib/tests
+
 # Basic source for the library.
-SUBDIRS = gnulib/lib images generator src examples po
+SUBDIRS += tests/data generator src examples po
 
 if ENABLE_DAEMON
 SUBDIRS += daemon
@@ -29,14 +32,27 @@ if ENABLE_APPLIANCE
 SUBDIRS += appliance
 endif
 
-# Tests and the test-tool.
-SUBDIRS += gnulib/tests capitests caution regressions test-tool
+# Tests - order is important.
+SUBDIRS += tests/qemu
+SUBDIRS += tests/guests
+SUBDIRS += tests/c-api
+SUBDIRS += tests/protocol
+SUBDIRS += tests/lvm
+SUBDIRS += tests/luks
+SUBDIRS += tests/md
+SUBDIRS += tests/regressions
+
+# Extra tests don't run by default.  You have to do 'make extra-tests'.
+SUBDIRS += tests/extra
+
+# libguestfs-test-tool
+SUBDIRS += test-tool
 
 # Guestfish.
 SUBDIRS += fish
 
 # virt-tools in C.
-SUBDIRS += cat df edit inspector rescue
+SUBDIRS += align cat df edit inspector rescue
 
 # Language bindings.
 if HAVE_PERL
@@ -69,21 +85,24 @@ SUBDIRS += csharp
 
 # virt-resize (new version) and virt-sparsify are written in OCaml.
 if HAVE_OCAML
-if HAVE_OCAML_PCRE
-SUBDIRS += resize
-endif
-SUBDIRS += sparsify
+SUBDIRS += resize sparsify
 endif
 
-# Perl tools and guestmount.
+# Perl tools.
 if HAVE_TOOLS
 SUBDIRS += tools
 endif
 
+# guestmount
 if HAVE_FUSE
 SUBDIRS += fuse
 endif
 
+# virt-tools in shell.  This uses guestmount and virt-inspector.
+if HAVE_FUSE
+SUBDIRS += clone
+endif
+
 # po-docs must come after tools, inspector.
 if HAVE_PO4A
 SUBDIRS += po-docs
@@ -96,7 +115,23 @@ EXTRA_DIST = \
 	bugs-in-changelog.sh \
 	autogen.sh \
 	bindtests \
+	contrib/autobuild/autobuild.sh \
+	contrib/guestfsd-in-wine.sh \
+	contrib/intro/libguestfs-intro.html \
+	contrib/intro/overview.svg \
+	contrib/intro/talk.txt \
+	contrib/intro/tools.svg \
 	contrib/README \
+	contrib/visualize-alignment/.gitignore \
+	contrib/visualize-alignment/guestfish-add-mount.qtr \
+	contrib/visualize-alignment/guestfish-lv-ext4-4k.qtr \
+	contrib/visualize-alignment/guestfish-lv-ext4-4k-write-hello.qtr \
+	contrib/visualize-alignment/guestfish-N-fs-10M-aligned-part-disk.qtr \
+	contrib/visualize-alignment/guestfish-N-fs-10M.qtr \
+	contrib/visualize-alignment/guestfish-write-hello.qtr \
+	contrib/visualize-alignment/qemu-0.13-trace-block-device-access.patch \
+	contrib/visualize-alignment/README \
+	contrib/visualize-alignment/tracetops.ml \
 	debian/.gitignore \
 	debian/changelog \
 	debian/compat \
@@ -142,8 +177,10 @@ HTMLFILES = \
 	html/guestfs-python.3.html \
 	html/guestfs-recipes.1.html \
 	html/guestfs-ruby.3.html \
+	html/guestfs-testing.1.html \
 	html/guestfish.1.html \
 	html/guestmount.1.html \
+	html/virt-alignment-scan.1.html \
 	html/virt-cat.1.html \
 	html/virt-copy-in.1.html \
 	html/virt-copy-out.1.html \
@@ -158,6 +195,7 @@ HTMLFILES = \
 	html/virt-rescue.1.html \
 	html/virt-resize.1.html \
 	html/virt-sparsify.1.html \
+	html/virt-sysprep.1.html \
 	html/virt-tar.1.html \
 	html/virt-tar-in.1.html \
 	html/virt-tar-out.1.html \
@@ -196,7 +234,7 @@ all-local:
 	find $(DIST_SUBDIRS) \
 	    -name '*.c' -o -name '*.pl' -o -name '*.pm' | \
 	grep -v '^perl/blib/' | \
-	grep -v '^capitests/' | \
+	grep -v '^tests/' | \
 	grep -v '^daemon/lib/' | \
 	grep -v '^daemon/tests/' | \
 	grep -v '^examples/' | \
@@ -206,6 +244,7 @@ all-local:
 	grep -v '/rc_protocol.c' | \
 	grep -v 'appliance/debian/root' | \
 	grep -v '^po-docs/' | \
+	grep -v '^images/' | \
 	LC_ALL=C sort | \
 	sed 's,^\./,,' > po/POTFILES.in
 
@@ -227,6 +266,11 @@ CLEANFILES = \
 quickcheck:
 	./run test-tool/libguestfs-test-tool $(QUICKCHECK_TEST_TOOL_ARGS)
 
+# Run extra-tests in tests/extra/ subdirectory.
+
+extra-tests:
+	make -C tests/extra $@
+
 # Make binary distribution.
 
 BINTMPDIR = /tmp/libguestfs-bin