X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=1ea6ff0ca3f1653c2be69ff2c66491570f3ecc8a;hp=41e8db981e6a2a44fec88632ecf1b5e71bdfcc52;hb=8d8b3fafa3655f0a389d98cac63db23ddf9b446c;hpb=12aedab609e09bdf8dd304487940d9d4ea46cb79

diff --git a/Makefile.am b/Makefile.am
index 41e8db9..1ea6ff0 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 -I gnulib/m4
+ACLOCAL_AMFLAGS = -I 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
 
@@ -158,11 +154,13 @@ dist-hook:
 all-local:
 	cd $(srcdir); \
 	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 '^perl/blib/' | \
+	grep -v '^capitests/' | \
+	grep -v '^daemon/lib/' | \
+	grep -v '^daemon/tests/' | \
+	grep -v '^examples/' | \
+	grep -v '^gnulib/' | \
+	grep -v '^perl/examples/' | \
 	grep -v '/guestfs_protocol.c' | \
 	grep -v '/rc_protocol.c' | \
 	LC_ALL=C sort | \