X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=60cfac0504467bd97acd571c98c5e3c5b203a82f;hp=68934b9f9d16ad0a48c51c2e77935b4d2c45de59;hb=45d78361d791f4a752fca9472b81bdc75f9f92a4;hpb=5aa57fbd34eb34922719d08712303b9d73ec215f

diff --git a/Makefile.am b/Makefile.am
index 68934b9..60cfac0 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
@@ -80,9 +89,13 @@ $(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
 	bash $(top_builddir)/update-initramfs.sh
 	touch $@
 
-# Tests.  These are auto-generated from the test descriptions.
+make-initramfs.sh: make-initramfs.sh.in
+	./config.status $@
+
+# Tests.  These are auto-generated from the test descriptions
+# in the generator.
 
-check_PROGRAMS = tests
+check_PROGRAMS = tests test-command
 
 tests_SOURCES = tests.c
 tests_CFLAGS = \
@@ -90,9 +103,21 @@ 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"
+
+# This binary must be statically linked.  It is used for testing
+# the "guestfs_command" and "guestfs_command_lines" functions.
+
+test_command_SOURCES = test-command.c
+test_command_LDFLAGS = -all-static
+
 # 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.
@@ -151,7 +176,9 @@ html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcar
 	sh make-recipes.sh recipes/*.sh > $@-t
 	mv $@-t $@
 
-website: html/guestfs.3.html html/guestfish.1.html html/recipes.html
+website: html/guestfs.3.html html/guestfish.1.html \
+	html/virt-inspector.1.html \
+	html/recipes.html
 	cp $^ html/pod.css html/recipes.css \
 	  $(HOME)/d/redhat/et-website/libguestfs/
 
@@ -192,11 +219,11 @@ 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.
 
-CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp *~ html/*~ recipes/*~
+CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp
 
 clean-local:
 	rm -rf initramfs