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

diff --git a/Makefile.am b/Makefile.am
index 39cf86c..17adf1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,50 +17,86 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src daemon fish examples
+SUBDIRS = src daemon appliance fish po examples images
+
+if HAVE_OCAML
+SUBDIRS += ocaml
+endif
+if HAVE_PERL
+SUBDIRS += perl
+endif
+if HAVE_PYTHON
+SUBDIRS += python
+endif
+if HAVE_RUBY
+SUBDIRS += ruby
+endif
+if HAVE_JAVA
+SUBDIRS += java
+endif
+if HAVE_HASKELL
+SUBDIRS += haskell
+endif
+if HAVE_INSPECTOR
+SUBDIRS += inspector
+endif
 
 EXTRA_DIST = \
-	make-initramfs.sh update-initramfs.sh \
+	config.rpath \
 	guestfs.pod guestfs-actions.pod guestfs-structs.pod \
-	libguestfs.spec \
-	HACKING
-
-# 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 $(builddir)/make-initramfs.sh; then rm -f $@; exit 1; fi
-
-$(INITRAMFSIMG): initramfs/fakeroot.log daemon/guestfsd
-	rm -f $@
-	bash $(builddir)/update-initramfs.sh
-	touch $@
-
-# Make clean.
-
-CLEANFILES = $(fs_DATA) emptydisk
-
-clean-local:
-	rm -rf initramfs
-
-# Manual page.
+	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 \
+	recipes/*.sh \
+	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
+
+# 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
+man_MANS = guestfs.3 guestfish.1
 
 guestfs.3: guestfs.pod guestfs-actions.pod guestfs-structs.pod
 	sed \
@@ -74,30 +110,73 @@ guestfs.3: guestfs.pod guestfs-actions.pod guestfs-structs.pod
 	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
 	  > $@
 
-# 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,vlan=0
+guestfish.1: guestfish.pod guestfish-actions.pod
+	sed \
+	  -e '/@ACTIONS@/rguestfish-actions.pod' -e 's/@ACTIONS@//' \
+	  < $< | \
+	$(POD2MAN) \
+	  --section 1 \
+	  -c "Virtualization Support" \
+	  --name "guestfish" \
+	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
+	  > $@
+
+noinst_DATA = html/guestfs.3.html html/guestfish.1.html
+
+html/guestfs.3.html: guestfs.pod guestfs-actions.pod guestfs-structs.pod
+	sed \
+	  -e '/@ACTIONS@/rguestfs-actions.pod' -e 's/@ACTIONS@//' \
+	  -e '/@STRUCTS@/rguestfs-structs.pod' -e 's/@STRUCTS@//' \
+	  < $< | \
+	pod2html \
+	  --css 'pod.css' \
+	  --title "libguestfs API documentation" \
+	  --htmldir html \
+	  --outfile $@
+
+html/guestfish.1.html: guestfish.pod guestfish-actions.pod
+	sed \
+	  -e '/@ACTIONS@/rguestfish-actions.pod' -e 's/@ACTIONS@//' \
+	  < $< | \
+	pod2html \
+	  --css 'pod.css' \
+	  --title "guestfish, libguestfs filesystem interactive shell" \
+	  --htmldir html \
+	  --outfile $@
+
+# Recipes web page.
+html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
+	rm -f $@ $@-t
+	sh make-recipes.sh recipes/*.sh > $@-t
+	mv $@-t $@
+
+HTMLFILES = html/guestfs.3.html html/guestfish.1.html \
+	html/virt-inspector.1.html \
+	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.
+
+dist-hook:
+	./gitlog-to-changelog > ChangeLog
+	cp ChangeLog $(distdir)/ChangeLog
+
+# Pkgconfig.
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libguestfs.pc
+
+# Make clean.
+
+CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp
+
+clean-local:
+	rm -rf initramfs