X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=5ab3b6d41df5fb6e3e796e50c037b4ad3f9c3c41;hp=9332a10d3de20c2eba79749a21a00c0e4e42741b;hb=204d54609b4b3e4ca637f0ce2fe98c33ce9d008b;hpb=c477e2fb78347728aaacbbc89666dcda1481a4b9

diff --git a/Makefile.am b/Makefile.am
index 9332a10..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
@@ -19,27 +19,26 @@ include $(top_srcdir)/subdir-rules.mk
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = gnulib/lib hivex src daemon appliance fish po examples images \
-	gnulib/tests capitests regressions test-tool
+# Basic source for the library.
+SUBDIRS = gnulib/lib images generator src examples po
 
-# NB: Must build inspector directory after perl and before ocaml.
-# We could relax this if we combined the inspector_generator with
-# the ordinary generator, but that brings other problems.
-if HAVE_PERL
-SUBDIRS += perl
-endif
-
-if HAVE_INSPECTOR
-SUBDIRS += inspector
+if ENABLE_DAEMON
+SUBDIRS += daemon
 endif
-if HAVE_TOOLS
-SUBDIRS += tools
+if ENABLE_APPLIANCE
+SUBDIRS += appliance
 endif
 
-if HAVE_FUSE
-SUBDIRS += fuse
-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
@@ -55,18 +54,30 @@ endif
 if HAVE_HASKELL
 SUBDIRS += haskell
 endif
+if HAVE_PHP
+SUBDIRS += php
+endif
+
+# Virt-inspector, tools and guestmount.
+if HAVE_INSPECTOR
+SUBDIRS += inspector
+endif
 
-generator_built = \
-	guestfs-structs.pod \
-	guestfs-actions.pod \
-	guestfish-actions.pod
+if HAVE_TOOLS
+SUBDIRS += tools
+endif
+
+if HAVE_FUSE
+SUBDIRS += fuse
+endif
+
+# po-docs must come after tools, inspector.
+SUBDIRS += po-docs
 
 EXTRA_DIST = \
 	$(generator_built) \
-	guestfs.pod \
-	guestfish.pod \
 	html/pod.css \
-	HACKING TODO \
+	BUGS HACKING RELEASE-NOTES TODO \
 	libguestfs.pc libguestfs.pc.in \
 	recipes/LICENSE \
 	recipes/README \
@@ -76,48 +87,26 @@ EXTRA_DIST = \
 	html/recipes.css \
 	make-recipes.sh \
 	contrib/README \
-	contrib/febootstrap/install.title \
-	contrib/febootstrap/install.html \
-	contrib/febootstrap/install.sh \
 	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 libguestfs.3 guestfish.1
+	.gitignore \
+	m4/.gitignore
 
-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' \
@@ -125,10 +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' \
@@ -147,15 +137,16 @@ HTMLFILES = \
 	html/guestfs.3.html \
 	html/guestfish.1.html \
 	html/guestmount.1.html \
-	html/hivex.3.html \
-	html/hivexget.1.html \
-	html/hivexml.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 \
@@ -174,25 +165,19 @@ website: $(HTMLFILES) $(TEXTFILES)
 	    -e "s/SUBST_DATE/$$date/" \
 	< index.html.in > index.html
 
-# Generate the ChangeLog automatically from the gitlog.
-
+# When doing 'make dist' update a few files automatically.
 dist-hook:
 	$(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' -o \
-	    -name 'virt-cat' -o \
-	    -name 'virt-df' -o \
-	    -name 'virt-edit' -o \
-	    -name 'virt-inspector' -o \
-	    -name 'virt-ls' -o \
-	    -name 'virt-rescue' -o \
-	    -name 'virt-tar' -o \
-	    -name 'virt-win-reg' | \
+	    -name '*.c' -o -name '*.pl' -o -name '*.pm' | \
 	grep -v '^perl/blib/' | \
 	grep -v '^capitests/' | \
 	grep -v '^daemon/lib/' | \
@@ -203,6 +188,7 @@ all-local:
 	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
 
@@ -221,3 +207,39 @@ CLEANFILES = $(fs_DATA) \
 
 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