X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=3ed781583fd045cfefbbe1b4d030f5807ec7de12;hp=38beecdbf533a02e53f86ba7fea962ec139575bd;hb=f57f1012a637a9950af43bf1b4925fa6b233789a;hpb=8980c01b46eafcf4b5dc127e4696c2cbe1bff09f

diff --git a/Makefile.am b/Makefile.am
index 38beecd..3ed7815 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.
 
@@ -81,11 +89,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 +105,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 +124,15 @@ 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-rescue.1.html \
+	html/virt-resize.1.html \
 	html/virt-tar.1.html \
 	html/virt-win-reg.1.html \
 	html/recipes.html \
@@ -160,8 +167,10 @@ 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-rescue' -o \
+	    -name 'virt-resize' -o \
 	    -name 'virt-tar' -o \
 	    -name 'virt-win-reg' | \
 	grep -v '^perl/blib/' | \
@@ -192,3 +201,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