X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=592ed9445285dac0408b08ccb1fe0319d68f8660;hp=f2f26e70e5ae8675dadf3a468aa6822bc926fe48;hb=03ff42cb2e088b00c15023d456058cbcdc5d3c81;hpb=41b959fd9b057354f642d84398b875d02b88b864;ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index f2f26e7..592ed94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,9 @@ endif
 if HAVE_JAVA
 SUBDIRS += java
 endif
+if HAVE_HASKELL
+SUBDIRS += haskell
+endif
 if HAVE_INSPECTOR
 SUBDIRS += inspector
 endif
@@ -42,7 +45,6 @@ EXTRA_DIST = \
 	make-initramfs.sh update-initramfs.sh \
 	guestfs.pod guestfs-actions.pod guestfs-structs.pod \
 	guestfish.pod guestfish-actions.pod \
-	libguestfs.spec \
 	html/pod.css \
 	HACKING TODO \
 	tests.c \
@@ -54,7 +56,14 @@ EXTRA_DIST = \
 	recipes/*.sh \
 	recipes/*.example \
 	html/recipes.css \
-	make-recipes.sh
+	make-recipes.sh \
+	test-cleanup.sh \
+	contrib/README \
+	contrib/centos5.3-libguestfs.spec \
+	contrib/fedora-libguestfs.spec \
+	contrib/febootstrap/install.title \
+	contrib/febootstrap/install.html \
+	contrib/febootstrap/install.sh
 
 # Build the root filesystem.
 # Currently this is arch-dependent, so it seems like putting it in
@@ -83,7 +92,8 @@ $(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
 make-initramfs.sh: make-initramfs.sh.in
 	./config.status $@
 
-# Tests.  These are auto-generated from the test descriptions.
+# Tests.  These are auto-generated from the test descriptions
+# in the generator.
 
 check_PROGRAMS = tests
 
@@ -93,9 +103,15 @@ tests_CFLAGS = \
 tests_LDADD = $(top_builddir)/src/libguestfs.la
 
 TESTS = $(check_PROGRAMS)
+TESTS_ENVIRONMENT = $(VG)
 
 $(TESTS): $(INITRAMFS) $(VMLINUZ)
 
+# Run the tests under valgrind.
+
+valgrind:
+	$(MAKE) check VG="valgrind --quiet --leak-check=full"
+
 # Manual pages.
 # guestfs-actions.pod and guestfs-structs are autogenerated.  There is
 # no include mechanism for POD, so we have to do it by hand.
@@ -197,7 +213,7 @@ test-boot-realistic: emptydisk
 	  -serial stdio \
 	  -net channel,6666:unix:/tmp/sock,server,nowait \
 	  -net user,vlan=0 \
-	  -net nic,vlan=0
+	  -net nic,model=virtio,vlan=0
 
 # Make clean.