Remove the specfile from the tarball. Include contrib/ dir.

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2286dd5..592ed94 100644 (file)
--- 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 \
@@ -55,7 +57,13 @@ EXTRA_DIST = \
        recipes/*.example \
        html/recipes.css \
        make-recipes.sh \
-       test-cleanup.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
@@ -84,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
 
@@ -94,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.