X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=87da5a8b5cdb78a25551f20e122bb171d50eb81b;hp=020d889debbc3ea277f05a825d594159049da9c9;hb=df54298591bec8d34e7855c3528a2d5d450ffb20;hpb=e28207d5ad7ed96e10467e38788239ef9690285e

diff --git a/Makefile.am b/Makefile.am
index 020d889..87da5a8 100644
--- 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,12 +19,18 @@ 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
+SUBDIRS = gnulib/lib src
+
+if ENABLE_DAEMON
+SUBDIRS += daemon
+endif
+if ENABLE_APPLIANCE
+SUBDIRS += appliance
+endif
+
+SUBDIRS += fish po examples images
+SUBDIRS += gnulib/tests capitests regressions test-tool
 
-# 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
@@ -69,7 +75,9 @@ EXTRA_DIST = \
 	html/recipes.css \
 	make-recipes.sh \
 	contrib/README \
-	bindtests
+	bindtests \
+	.gitignore \
+	m4/.gitignore
 
 # HTML versions of manual pages.
 
@@ -116,9 +124,6 @@ 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 \
@@ -192,3 +197,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