X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=8fed9ec1fbe1b53bb91fff1c4f12eccdc49c500c;hp=e5ca43c7e33ba2f80e9eafc8fb62e41acacdb90a;hb=33687dfaa00658a602180f3afcebe9552804a048;hpb=480a489ee4c31cb2f9c9f45941645f05b5f74c67

diff --git a/Makefile.am b/Makefile.am
index e5ca43c..8fed9ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
 
 SUBDIRS = gnulib/lib src daemon appliance fish po examples images \
 	gnulib/tests capitests regressions test-tool
@@ -41,9 +41,6 @@ endif
 if HAVE_INSPECTOR
 SUBDIRS += inspector
 endif
-if HAVE_V2V
-SUBDIRS += v2v
-endif
 if HAVE_DF
 SUBDIRS += df
 endif
@@ -136,7 +133,6 @@ HTMLFILES = html/guestfs.3.html html/guestfish.1.html \
 	html/virt-cat.1.html \
 	html/virt-df.1.html \
 	html/virt-inspector.1.html \
-	html/virt-v2v.1.html \
 	html/recipes.html \
 	html/pod.css html/recipes.css
 
@@ -160,6 +156,8 @@ all-local:
 	find $(DIST_SUBDIRS) -name '*.c' -o -name '*.pl' -o -name '*.pm' | \
 	grep -v 'perl/blib/' | \
 	grep -v 'capitests/' | \
+	grep -v 'daemon/lib/' | \
+	grep -v 'daemon/tests/' | \
 	grep -v 'examples/' | \
 	grep -v '/guestfs_protocol.c' | \
 	grep -v '/rc_protocol.c' | \