X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=5ab3b6d41df5fb6e3e796e50c037b4ad3f9c3c41;hp=c0c2ebbef580d167691c90dc61d7475ef6bc6633;hb=c50eb8f1cc33009f1ed29a002066e026fe2923f4;hpb=b86d7b975629ae099ad9a137ced6f23b17c1531a

diff --git a/Makefile.am b/Makefile.am
index c0c2ebb..5ab3b6d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs
-# Copyright (C) 2009 Red Hat Inc.
+# Copyright (C) 2009-2010 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,16 +15,33 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src daemon fish examples images
+# Basic source for the library.
+SUBDIRS = gnulib/lib images generator src examples po
 
-if HAVE_OCAML
-SUBDIRS += ocaml
+if ENABLE_DAEMON
+SUBDIRS += daemon
+endif
+if ENABLE_APPLIANCE
+SUBDIRS += appliance
 endif
+
+# Tests and the test-tool.
+SUBDIRS += gnulib/tests capitests regressions test-tool
+
+# Guestfish.
+SUBDIRS += fish
+
+# Language bindings.
 if HAVE_PERL
 SUBDIRS += perl
 endif
+if HAVE_OCAML
+SUBDIRS += ocaml ocaml/examples
+endif
 if HAVE_PYTHON
 SUBDIRS += python
 endif
@@ -34,95 +51,62 @@ endif
 if HAVE_JAVA
 SUBDIRS += java
 endif
+if HAVE_HASKELL
+SUBDIRS += haskell
+endif
+if HAVE_PHP
+SUBDIRS += php
+endif
+
+# Virt-inspector, tools and guestmount.
+if HAVE_INSPECTOR
+SUBDIRS += inspector
+endif
+
+if HAVE_TOOLS
+SUBDIRS += tools
+endif
+
+if HAVE_FUSE
+SUBDIRS += fuse
+endif
+
+# po-docs must come after tools, inspector.
+SUBDIRS += po-docs
 
 EXTRA_DIST = \
-	make-initramfs.sh update-initramfs.sh \
-	guestfs.pod guestfs-actions.pod guestfs-structs.pod \
-	guestfish.pod guestfish-actions.pod \
-	libguestfs.spec \
+	$(generator_built) \
 	html/pod.css \
-	HACKING TODO \
-	tests.c \
+	BUGS HACKING RELEASE-NOTES TODO \
 	libguestfs.pc libguestfs.pc.in \
-	gitlog-to-changelog \
 	recipes/LICENSE \
 	recipes/README \
 	recipes/*.html \
 	recipes/*.sh \
-	recipes/*.example
-
-# 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
+	recipes/*.example \
+	html/recipes.css \
+	make-recipes.sh \
+	contrib/README \
+	bindtests \
+	.gitignore \
+	m4/.gitignore
 
-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 $@
-
-# Tests.  These are auto-generated from the test descriptions.
-
-check_PROGRAMS = tests
-
-tests_SOURCES = tests.c
-tests_CFLAGS = \
-	-I$(top_builddir)/src -Wall
-tests_LDADD = $(top_builddir)/src/libguestfs.la
-
-TESTS = $(check_PROGRAMS)
-
-$(TESTS): $(INITRAMFS) $(VMLINUZ)
-
-# 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
-
-guestfs.3: 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@//' \
-	  < $< | \
-	$(POD2MAN) \
-	  --section 3 \
-	  -c "Virtualization Support" \
-	  --name "guestfs" \
-	  --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
-	  > $@
-
-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)" \
-	  > $@
+# HTML versions of manual pages.
 
 noinst_DATA = html/guestfs.3.html html/guestfish.1.html
 
-html/guestfs.3.html: guestfs.pod guestfs-actions.pod guestfs-structs.pod
+html/guestfs.3.html: src/guestfs.pod \
+		src/guestfs-actions.pod \
+		src/guestfs-availability.pod \
+		src/guestfs-structs.pod
+	mkdir -p html
 	sed \
-	  -e '/@ACTIONS@/rguestfs-actions.pod' -e 's/@ACTIONS@//' \
-	  -e '/@STRUCTS@/rguestfs-structs.pod' -e 's/@STRUCTS@//' \
+	  -e '/@ACTIONS@/rsrc/guestfs-actions.pod' \
+	  -e 's/@ACTIONS@//' \
+	  -e '/@AVAILABILITY@/rsrc/guestfs-availability.pod' \
+	  -e 's/@AVAILABILITY@//' \
+	  -e '/@STRUCTS@/rsrc/guestfs-structs.pod' \
+	  -e 's/@STRUCTS@//' \
 	  < $< | \
 	pod2html \
 	  --css 'pod.css' \
@@ -130,9 +114,11 @@ html/guestfs.3.html: guestfs.pod guestfs-actions.pod guestfs-structs.pod
 	  --htmldir html \
 	  --outfile $@
 
-html/guestfish.1.html: guestfish.pod guestfish-actions.pod
+html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod fish/guestfish-commands.pod
+	mkdir -p html
 	sed \
-	  -e '/@ACTIONS@/rguestfish-actions.pod' -e 's/@ACTIONS@//' \
+	  -e '/@ACTIONS@/rfish/guestfish-actions.pod' -e 's/@ACTIONS@//' \
+	  -e '/@FISH_COMMANDS@/rguestfish-commands.pod' -e 's/@FISH_COMMANDS@//' \
 	  < $< | \
 	pod2html \
 	  --css 'pod.css' \
@@ -141,81 +127,119 @@ html/guestfish.1.html: guestfish.pod guestfish-actions.pod
 	  --outfile $@
 
 # Recipes web page.
-html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile
+html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
+	mkdir -p html
 	rm -f $@ $@-t
-	echo '<html><head><title>guestfish recipes</title>' >> $@-t; \
-	echo '<link rel="stylesheet" href="http://et.redhat.com/~rjones/css/standard.css" type="text/css" title="Standard"/>' >> $@-t; \
-	echo '<link rel="stylesheet" href="http://et.redhat.com/~rjones/css/numbering.css" type="text/css" title="Standard"/>' >> $@-t; \
-	echo '<link rel="alternate stylesheet" href="http://et.redhat.com/~rjones/css/easytoread.css" type="text/css" title="High contrast, big fonts"/>' >> $@-t; \
-	echo '</head><body>' >> $@-t; \
-	echo '<h1>guestfish recipes</h1>' >> $@-t; \
-	echo '<p>You can also find these in the <code>recipes/</code> subdirectory of the source.</p>' >> $@-t; \
-	for f in recipes/*.sh; do \
-	  b=`basename $$f .sh`; \
-	  echo -n '<a name="'$$b'"></a>' >> $@-t; \
-	  if [ -r recipes/$$b.html ]; then \
-	    cat recipes/$$b.html >> $@-t; \
-	  else \
-	    echo '<h2>$$b</h2>' >> $@-t; \
-	  fi; \
-	  echo '<pre>' >> $@-t; \
-	  sed -e 's,&,\&amp;,g' -e 's,<,\&lt;,g' -e 's,>,\&gt;,g' < $$f >> $@-t; \
-	  echo '</pre>' >> $@-t; \
-	  if [ -r recipes/$$b.example ]; then \
-	    echo '<h3>Example output</h3>' >> $@-t; \
-	    echo '<pre>' >> $@-t; \
-	    sed -e 's,&,\&amp;,g' -e 's,<,\&lt;,g' -e 's,>,\&gt;,g' < recipes/$$b.example >> $@-t; \
-	    echo '</pre>' >> $@-t; \
-	  fi; \
-	done; \
-	echo '</body></html>' >> $@-t; \
+	sh make-recipes.sh recipes/*.sh > $@-t
 	mv $@-t $@
 
-website: html/guestfs.3.html html/guestfish.1.html html/recipes.html
-	cp $^ html/pod.css $(HOME)/d/redhat/et-website/libguestfs/
-
-# Generate the ChangeLog automatically from the gitlog.
-
+HTMLFILES = \
+	html/guestfs.3.html \
+	html/guestfish.1.html \
+	html/guestmount.1.html \
+	html/virt-cat.1.html \
+	html/virt-df.1.html \
+	html/virt-edit.1.html \
+	html/virt-inspector.1.html \
+	html/virt-list-filesystems.1.html \
+	html/virt-list-partitions.1.html \
+	html/virt-ls.1.html \
+	html/virt-make-fs.1.html \
+	html/virt-rescue.1.html \
+	html/virt-resize.1.html \
+	html/virt-tar.1.html \
+	html/virt-win-reg.1.html \
+	html/recipes.html \
+	html/pod.css html/recipes.css
+
+TEXTFILES = README TODO HACKING
+
+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
+
+# When doing 'make dist' update a few files automatically.
 dist-hook:
-	./gitlog-to-changelog > ChangeLog
+	$(top_srcdir)/build-aux/gitlog-to-changelog > ChangeLog
 	cp ChangeLog $(distdir)/ChangeLog
+	$(top_srcdir)/update-bugs > BUGS-t
+	mv BUGS-t BUGS
+	cp BUGS $(distdir)/BUGS
+
+# 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 '^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' | \
+	grep -v 'appliance/debian/root' | \
+	grep -v '^po-docs/' | \
+	LC_ALL=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,vlan=0
-
 # Make clean.
 
-CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp *~ html/*~
+CLEANFILES = $(fs_DATA) \
+	emptydisk \
+	pod2htm?.tmp \
+	html/*.html \
+	guestfs.3 guestfish.1
 
 clean-local:
 	rm -rf initramfs
+
+# If you don't want to run all of the tests ('make check') then this
+# will just run libguestfs-test-tool for a quick check.  Note this
+# is NOT a substitute for proper testing!
+
+quickcheck:
+	test-tool/run-test-tool-locally
+
+# Mostly static binary distribution.
+#
+# Some binaries are relinked partially statically.  You can make these
+# binaries "more static" by making sure that as many foo-static
+# packages are installed as possible.
+#
+# We remove the supermin appliance and adjust some directories to make
+# them non-Fedora-specific.
+
+BINTMPDIR = /tmp/libguestfs-bin
+bindist:
+	rm -rf $(BINTMPDIR)
+	mkdir $(BINTMPDIR)
+	$(MAKE)
+	$(MAKE) DESTDIR=$(BINTMPDIR) install
+	rm -r $(BINTMPDIR)$(libdir)/guestfs/supermin.d
+	rm $(BINTMPDIR)$(libdir)/guestfs/kmod.whitelist
+	mv $(BINTMPDIR)$(prefix)/lib64/* $(BINTMPDIR)$(libdir)
+	mv $(BINTMPDIR)/usr/lib64/* $(BINTMPDIR)$(libdir)
+	-find $(BINTMPDIR) -type d -exec rmdir --ignore-fail-on-non-empty {} \;
+	$(MAKE) -C fish guestfish.static
+	cp fish/guestfish.static $(BINTMPDIR)$(bindir)/guestfish
+	$(MAKE) -C fuse guestmount.static
+	cp fuse/guestmount.static $(BINTMPDIR)$(bindir)/guestmount
+	$(MAKE) -C test-tool libguestfs-test-tool.static
+	cp test-tool/libguestfs-test-tool.static $(BINTMPDIR)$(bindir)/libguestfs-test-tool
+	(cd $(BINTMPDIR) && tar cf - .) | \
+	  gzip -c -9 > libguestfs-$(VERSION)-$(host_cpu).tar.gz