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

diff --git a/Makefile.am b/Makefile.am
index e9e02bf..1f6f62e 100644
--- 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
@@ -40,15 +41,22 @@ endif
 if HAVE_INSPECTOR
 SUBDIRS += inspector
 endif
+if HAVE_V2V
+SUBDIRS += v2v
+endif
+if HAVE_DF
+SUBDIRS += df
+endif
+if HAVE_CAT
+SUBDIRS += cat
+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,77 +66,18 @@ 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 \
+	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 \
@@ -156,6 +105,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@//' \
@@ -167,6 +117,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@//' \
 	  < $< | \
@@ -178,18 +129,22 @@ 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-inspector.1.html \
+	html/virt-v2v.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)
@@ -201,42 +156,30 @@ dist-hook:
 	./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' | \
+	grep -v 'perl/blib/' | \
+	grep -v 'capitests/' | \
+	grep -v 'examples/' | \
+	grep -v '/guestfs_protocol.c' | \
+	grep -v '/rc_protocol.c' | \
+	sort | \
+	sed 's,^\./,,' > po/POTFILES.in
+
 # Pkgconfig.
 
 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
+CLEANFILES = $(fs_DATA) \
+	emptydisk \
+	pod2htm?.tmp \
+	html/*.html \
+	guestfs.3 guestfish.1
 
 clean-local:
 	rm -rf initramfs