X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=771ee21d2157df746fa08352bfbba63b29a34cb0;hp=b4df8a86ab62516dd96251f3109d8720ad66eacb;hb=29204fe10d6ad46bace50e82557cb95e8a0f3529;hpb=252bf70225e95dcd4b254d8bcfa8e9cb5251f11b

diff --git a/Makefile.am b/Makefile.am
index b4df8a8..771ee21 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
@@ -34,12 +34,17 @@ endif
 if HAVE_JAVA
 SUBDIRS += java
 endif
+if HAVE_HASKELL
+SUBDIRS += haskell
+endif
+if HAVE_INSPECTOR
+SUBDIRS += inspector
+endif
 
 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 \
@@ -51,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
@@ -70,26 +82,45 @@ $(INITRAMFSIMG) $(VMLINUZ): initramfs/fakeroot.log
 initramfs/fakeroot.log: make-initramfs.sh.in
 	-mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak
 	-mv $(VMLINUZ) $(VMLINUZ).bak
-	if ! bash $(builddir)/make-initramfs.sh; then rm -f $@; exit 1; fi
+	if ! bash $(top_builddir)/make-initramfs.sh; then rm -f $@; exit 1; fi
 
 $(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
 	rm -f $@
-	bash $(builddir)/update-initramfs.sh
+	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 $@
 
-check_PROGRAMS = tests
+# Tests.  These are auto-generated from the test descriptions
+# in the generator.
+
+check_PROGRAMS = tests test-command
 
 tests_SOURCES = tests.c
 tests_CFLAGS = \
 	-I$(top_builddir)/src -Wall
 tests_LDADD = $(top_builddir)/src/libguestfs.la
 
-TESTS = $(check_PROGRAMS)
+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) \
+	$(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.
@@ -148,7 +179,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/
 
@@ -189,11 +222,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