Fix detection of optional libvirt support in virt-inspector.

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e9e02bf..142cf3e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src daemon fish po examples images
+SUBDIRS = src daemon appliance fish po examples images \
+       capitests regressions
 
 if HAVE_OCAML
 SUBDIRS += ocaml
@@ -43,12 +44,10 @@ endif
 
 EXTRA_DIST = \
        config.rpath \
-       make-initramfs.sh update-initramfs.sh \
        guestfs.pod guestfs-actions.pod guestfs-structs.pod \
        guestfish.pod guestfish-actions.pod \
        html/pod.css \
        HACKING TODO \
-       tests.c \
        libguestfs.pc libguestfs.pc.in \
        gitlog-to-changelog \
        recipes/LICENSE \
@@ -58,71 +57,11 @@ EXTRA_DIST = \
        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 \
-       test-bootbootboot.sh
-
-# Build the root filesystem.
-# Currently this is arch-dependent, so it seems like putting it in
-# $(libdir) is best.  When we build cross-architecture filesystems we
-# should probably move them to $(datadir).
-
-fsdir = $(libdir)/guestfs
-
-INITRAMFSIMG = initramfs.$(REPO).$(host_cpu).img
-VMLINUZ = vmlinuz.$(REPO).$(host_cpu)
-
-fs_DATA =  $(INITRAMFSIMG) $(VMLINUZ)
-
-$(INITRAMFSIMG) $(VMLINUZ): initramfs/fakeroot.log
-
-initramfs/fakeroot.log: make-initramfs.sh.in
-       -mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak
-       -mv $(VMLINUZ) $(VMLINUZ).bak
-       if ! bash $(top_builddir)/make-initramfs.sh; then rm -f $@; exit 1; fi
-
-$(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
-       rm -f $@
-       bash $(top_builddir)/update-initramfs.sh
-       touch $@
-
-make-initramfs.sh: make-initramfs.sh.in
-       ./config.status $@
-
-# 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 = tests test-bootbootboot.sh
-TESTS_ENVIRONMENT = \
-       SKIP_TEST_COMMAND=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
-       SKIP_TEST_COMMAND_LINES=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
-       SKIP_TEST_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
+       bindtests
 
 # Manual pages.
 # guestfs-actions.pod and guestfs-structs are autogenerated.  There is
@@ -189,7 +128,7 @@ HTMLFILES = html/guestfs.3.html html/guestfish.1.html \
 
 TEXTFILES = README TODO HACKING
 
-WEBSITEDIR = $(HOME)/d/redhat/et-website/libguestfs
+WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs
 
 website: $(HTMLFILES) $(TEXTFILES)
        cp $(HTMLFILES) $(WEBSITEDIR)
@@ -206,34 +145,6 @@ dist-hook:
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libguestfs.pc
 
-# Test-boot the image.
-
-test-boot: emptydisk
-       qemu-system-$(host_cpu) \
-         -m 384 \
-         -kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \
-         -hda emptydisk
-
-emptydisk:
-       rm -f emptydisk
-       dd if=/dev/zero of=emptydisk bs=1024 count=1440
-       echo 0, | sfdisk -q -C 80 -H 2 -S 18 emptydisk > /dev/null
-
-# This is a more realistic test boot command line which better
-# reflects what the library does.
-
-test-boot-realistic: emptydisk
-       qemu-system-$(host_cpu) \
-         -m 384 \
-         -kernel $(VMLINUZ) -initrd $(INITRAMFSIMG) \
-         -hda emptydisk \
-         -append "console=ttyS0 guestfs=10.0.2.4:6666" \
-         -nographic \
-         -serial stdio \
-         -net channel,6666:unix:/tmp/sock,server,nowait \
-         -net user,vlan=0 \
-         -net nic,model=virtio,vlan=0
-
 # Make clean.
 
 CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp