X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=efde00078b5f3caa19a73aff93b3f053015bf3ed;hb=4091fffcd5d7b2820086e019b71eae23a2d4a9e9;hp=c035977de46c712b0dfbb2e751f7240da8abcb84;hpb=7b309445d4e9f93088ca052469338c8e3ce8dcbf;p=libguestfs.git

diff --git a/Makefile.am b/Makefile.am
index c035977..efde000 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src daemon fish examples images
+SUBDIRS = src daemon fish po examples images
 
 if HAVE_OCAML
 SUBDIRS += ocaml
@@ -42,6 +42,7 @@ SUBDIRS += inspector
 endif
 
 EXTRA_DIST = \
+	config.rpath \
 	make-initramfs.sh update-initramfs.sh \
 	guestfs.pod guestfs-actions.pod guestfs-structs.pod \
 	guestfish.pod guestfish-actions.pod \
@@ -63,7 +64,8 @@ EXTRA_DIST = \
 	contrib/fedora-libguestfs.spec \
 	contrib/febootstrap/install.title \
 	contrib/febootstrap/install.html \
-	contrib/febootstrap/install.sh
+	contrib/febootstrap/install.sh \
+	test-bootbootboot.sh
 
 # Build the root filesystem.
 # Currently this is arch-dependent, so it seems like putting it in
@@ -97,15 +99,16 @@ make-initramfs.sh: make-initramfs.sh.in
 
 check_PROGRAMS = tests test-command
 
-tests_SOURCES = tests.c test-bootbootboot.sh
+tests_SOURCES = tests.c
 tests_CFLAGS = \
 	-I$(top_builddir)/src -Wall
 tests_LDADD = $(top_builddir)/src/libguestfs.la
 
-TESTS = tests
+TESTS = tests test-bootbootboot.sh
 TESTS_ENVIRONMENT = \
 	SKIP_TEST_COMMAND=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
-	SKIP_ZEROFREE=$(shell test -x initramfs/usr/sbin/zerofree || echo 1) \
+	SKIP_TEST_COMMAND_LINES=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
+	SKIP_TEST_ZEROFREE=$(shell test -x initramfs/usr/sbin/zerofree || echo 1) \
 	$(VG)
 
 $(TESTS): $(INITRAMFS) $(VMLINUZ)