X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=d14cc123334d6748cd37948df0e12f6b7e4ad07d;hb=c655415dc051b84d6178399e5f7cb76ff7af06c0;hp=9ae52175a6eb748e9429225636403dc72c2ee873;hpb=c649817586e5b4df53b251d1290422f5ef046045;p=libguestfs.git

diff --git a/Makefile.am b/Makefile.am
index 9ae5217..d14cc12 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,8 +19,11 @@ 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,11 +32,21 @@ if ENABLE_APPLIANCE
 SUBDIRS += appliance
 endif
 
-# Tests and the test-tool.
-SUBDIRS += gnulib/tests tests/c-api tests/qemu
-SUBDIRS += tests/protocol tests/lvm tests/luks tests/md
+# 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
-SUBDIRS += tests/extra test-tool
+
+# 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
@@ -208,7 +221,7 @@ dist-hook:
 	$(top_srcdir)/update-bugs.sh > BUGS-t
 	mv BUGS-t BUGS
 	cp BUGS $(distdir)/BUGS
-	git log --pretty="format:%an" | sort -u | \
+	git log --pretty="format:%an <%ae>" | sort -u | uniq -w 10 | \
 		grep -v rjones | \
 		grep -v "Richard Jones" \
 		> AUTHORS-t