test-bootbootboot.sh is a test, not a source file.

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2345018..9fa44f2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,14 +28,42 @@ endif
 if HAVE_PYTHON
 SUBDIRS += python
 endif
+if HAVE_RUBY
+SUBDIRS += ruby
+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
+       HACKING TODO \
+       tests.c \
+       libguestfs.pc libguestfs.pc.in \
+       gitlog-to-changelog \
+       recipes/LICENSE \
+       recipes/README \
+       recipes/*.html \
+       recipes/*.sh \
+       recipes/*.example \
+       html/recipes.css \
+       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
@@ -54,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.
@@ -126,8 +173,28 @@ html/guestfish.1.html: guestfish.pod guestfish-actions.pod
          --htmldir html \
          --outfile $@
 
-website: html/guestfs.3.html html/guestfish.1.html
-       cp $^ html/pod.css $(HOME)/d/redhat/et-website/libguestfs/
+# Recipes web page.
+html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
+       rm -f $@ $@-t
+       sh make-recipes.sh recipes/*.sh > $@-t
+       mv $@-t $@
+
+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/
+
+# Generate the ChangeLog automatically from the gitlog.
+
+dist-hook:
+       ./gitlog-to-changelog > ChangeLog
+       cp ChangeLog $(distdir)/ChangeLog
+
+# Pkgconfig.
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libguestfs.pc
 
 # Test-boot the image.
 
@@ -155,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/*~
+CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp
 
 clean-local:
        rm -rf initramfs