build: use only one m4/ directory

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e5ca43c..bbf23d9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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' | \