abs_top_builddir doesn't exist in old RHEL 5 automake, use top_builddir instead.

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ffe558b..e9e02bf 100644 (file)
--- 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
@@ -42,6 +42,7 @@ SUBDIRS += inspector
 endif
 
 EXTRA_DIST = \
+       config.rpath \
        make-initramfs.sh update-initramfs.sh \
        guestfs.pod guestfs-actions.pod guestfs-structs.pod \
        guestfish.pod guestfish-actions.pod \
@@ -63,7 +64,8 @@ EXTRA_DIST = \
        contrib/fedora-libguestfs.spec \
        contrib/febootstrap/install.title \
        contrib/febootstrap/install.html \
-       contrib/febootstrap/install.sh
+       contrib/febootstrap/install.sh \
+       test-bootbootboot.sh
 
 # Build the root filesystem.
 # Currently this is arch-dependent, so it seems like putting it in
@@ -102,8 +104,12 @@ tests_CFLAGS = \
        -I$(top_builddir)/src -Wall
 tests_LDADD = $(top_builddir)/src/libguestfs.la
 
-TESTS = tests
-TESTS_ENVIRONMENT = $(VG)
+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)
 
@@ -176,11 +182,18 @@ 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 \
+HTMLFILES = 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/
+       html/recipes.html \
+       html/pod.css html/recipes.css
+
+TEXTFILES = README TODO HACKING
+
+WEBSITEDIR = $(HOME)/d/redhat/et-website/libguestfs
+
+website: $(HTMLFILES) $(TEXTFILES)
+       cp $(HTMLFILES) $(WEBSITEDIR)
+       for f in $(TEXTFILES); do cp $$f $(WEBSITEDIR)/$$f.txt; done
 
 # Generate the ChangeLog automatically from the gitlog.