X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=e9e02bfa9d49140896d9032b87ee6cc126bc9091;hp=8f81a07604a6ebf920064a61414bb66c89aa545c;hb=7682199cfca20a52664c8e52035a06345862f226;hpb=c419731e3a04333aea7d1af7e1069221a34344a5

diff --git a/Makefile.am b/Makefile.am
index 8f81a07..e9e02bf 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,15 +34,18 @@ endif
 if HAVE_JAVA
 SUBDIRS += java
 endif
+if HAVE_HASKELL
+SUBDIRS += haskell
+endif
 if HAVE_INSPECTOR
 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 \
-	libguestfs.spec \
 	html/pod.css \
 	HACKING TODO \
 	tests.c \
@@ -55,7 +58,14 @@ EXTRA_DIST = \
 	recipes/*.example \
 	html/recipes.css \
 	make-recipes.sh \
-	test-cleanup.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
@@ -84,17 +94,22 @@ $(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
 make-initramfs.sh: make-initramfs.sh.in
 	./config.status $@
 
-# Tests.  These are auto-generated from the test descriptions.
+# 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 = \
 	-I$(top_builddir)/src -Wall
 tests_LDADD = $(top_builddir)/src/libguestfs.la
 
-TESTS = $(check_PROGRAMS)
-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)
 
@@ -103,6 +118,12 @@ $(TESTS): $(INITRAMFS) $(VMLINUZ)
 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.
@@ -161,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.