X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=90c51f1b36fa9154995e664397fe79f0b90c2696;hp=17adf1ca09acd03656d59771f9572e127d6067f5;hb=c6b8db6493dd633bf48b13daf72cdc9c078b5f9a;hpb=a1e8cdf2a254c5eddaf525cd7c34e4c937690204

diff --git a/Makefile.am b/Makefile.am
index 17adf1c..90c51f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,10 +17,11 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src daemon appliance fish po examples images
+SUBDIRS = gnulib/lib src daemon appliance fish po examples images \
+	gnulib/tests capitests regressions test-tool
 
 if HAVE_OCAML
-SUBDIRS += ocaml
+SUBDIRS += ocaml ocaml/examples
 endif
 if HAVE_PERL
 SUBDIRS += perl
@@ -40,16 +41,25 @@ endif
 if HAVE_INSPECTOR
 SUBDIRS += inspector
 endif
+if HAVE_DF
+SUBDIRS += df
+endif
+if HAVE_CAT
+SUBDIRS += cat
+endif
+if HAVE_RESCUE
+SUBDIRS += rescue
+endif
+if HAVE_EDIT
+SUBDIRS += edit
+endif
 
 EXTRA_DIST = \
-	config.rpath \
 	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 \
 	recipes/README \
 	recipes/*.html \
@@ -57,46 +67,18 @@ EXTRA_DIST = \
 	recipes/*.example \
 	html/recipes.css \
 	make-recipes.sh \
-	test-cleanup.sh \
 	contrib/README \
 	contrib/febootstrap/install.title \
 	contrib/febootstrap/install.html \
 	contrib/febootstrap/install.sh \
-	test-bootbootboot.sh
-
-# 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)
-
-# 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 \
+	libguestfs.3
 
 # 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.
 
-man_MANS = guestfs.3 guestfish.1
+man_MANS = guestfs.3 libguestfs.3 guestfish.1
 
 guestfs.3: guestfs.pod guestfs-actions.pod guestfs-structs.pod
 	sed \
@@ -124,6 +106,7 @@ guestfish.1: guestfish.pod guestfish-actions.pod
 noinst_DATA = html/guestfs.3.html html/guestfish.1.html
 
 html/guestfs.3.html: guestfs.pod guestfs-actions.pod guestfs-structs.pod
+	mkdir -p html
 	sed \
 	  -e '/@ACTIONS@/rguestfs-actions.pod' -e 's/@ACTIONS@//' \
 	  -e '/@STRUCTS@/rguestfs-structs.pod' -e 's/@STRUCTS@//' \
@@ -135,6 +118,7 @@ html/guestfs.3.html: guestfs.pod guestfs-actions.pod guestfs-structs.pod
 	  --outfile $@
 
 html/guestfish.1.html: guestfish.pod guestfish-actions.pod
+	mkdir -p html
 	sed \
 	  -e '/@ACTIONS@/rguestfish-actions.pod' -e 's/@ACTIONS@//' \
 	  < $< | \
@@ -146,29 +130,61 @@ html/guestfish.1.html: guestfish.pod guestfish-actions.pod
 
 # Recipes web page.
 html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
+	mkdir -p html
 	rm -f $@ $@-t
 	sh make-recipes.sh recipes/*.sh > $@-t
 	mv $@-t $@
 
 HTMLFILES = html/guestfs.3.html html/guestfish.1.html \
+	html/virt-cat.1.html \
+	html/virt-df.1.html \
+	html/virt-edit.1.html \
 	html/virt-inspector.1.html \
+	html/virt-rescue.1.html \
 	html/recipes.html \
 	html/pod.css html/recipes.css
 
 TEXTFILES = README TODO HACKING
 
-WEBSITEDIR = $(HOME)/d/redhat/et-website/libguestfs
+WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs
 
 website: $(HTMLFILES) $(TEXTFILES)
 	cp $(HTMLFILES) $(WEBSITEDIR)
 	for f in $(TEXTFILES); do cp $$f $(WEBSITEDIR)/$$f.txt; done
+	cd $(WEBSITEDIR) && \
+	date=`date +%F`; \
+	sed -e "s/SUBST_VERSION/$(VERSION)/" \
+	    -e "s/SUBST_DATE/$$date/" \
+	< index.html.in > index.html
 
 # Generate the ChangeLog automatically from the gitlog.
 
 dist-hook:
-	./gitlog-to-changelog > ChangeLog
+	$(top_srcdir)/build-aux/gitlog-to-changelog > ChangeLog
 	cp ChangeLog $(distdir)/ChangeLog
 
+# Update the list of translatable files in po/POTFILES.in.
+all-local:
+	cd $(srcdir); \
+	find $(DIST_SUBDIRS) \
+	    -name '*.c' -o -name '*.pl' -o -name '*.pm' -o \
+	    -name 'virt-cat' -o \
+	    -name 'virt-df' -o \
+	    -name 'virt-edit' -o \
+	    -name 'virt-inspector' -o \
+	    -name 'virt-rescue' | \
+	grep -v '^perl/blib/' | \
+	grep -v '^capitests/' | \
+	grep -v '^daemon/lib/' | \
+	grep -v '^daemon/tests/' | \
+	grep -v '^examples/' | \
+	grep -v '^gnulib/' | \
+	grep -v '^perl/examples/' | \
+	grep -v '/guestfs_protocol.c' | \
+	grep -v '/rc_protocol.c' | \
+	LC_ALL=C sort | \
+	sed 's,^\./,,' > po/POTFILES.in
+
 # Pkgconfig.
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -176,7 +192,11 @@ pkgconfig_DATA = libguestfs.pc
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp
+CLEANFILES = $(fs_DATA) \
+	emptydisk \
+	pod2htm?.tmp \
+	html/*.html \
+	guestfs.3 guestfish.1
 
 clean-local:
 	rm -rf initramfs