X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=acd8efc3aa86ddd4dd7f435d7673e043c5ba9ed4;hb=880374c6df2a694bb1457231f110d9ef7035e5b7;hp=5b19c3084f5fd2fe6ca62f0b59e601b89d437818;hpb=37e632b7b8e1bd8c9893bb8e3c9a8691c78256a4;p=libguestfs.git

diff --git a/Makefile.am b/Makefile.am
index 5b19c30..acd8efc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs
-# Copyright (C) 2009-2010 Red Hat Inc.
+# Copyright (C) 2009-2011 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
@@ -30,13 +30,13 @@ SUBDIRS += appliance
 endif
 
 # Tests and the test-tool.
-SUBDIRS += gnulib/tests capitests regressions test-tool
+SUBDIRS += gnulib/tests capitests caution regressions test-tool
 
 # Guestfish.
 SUBDIRS += fish
 
 # virt-tools in C.
-SUBDIRS += cat inspector
+SUBDIRS += cat df inspector rescue
 
 # Language bindings.
 if HAVE_PERL
@@ -74,12 +74,14 @@ SUBDIRS += fuse
 endif
 
 # po-docs must come after tools, inspector.
+if HAVE_PO4A
 SUBDIRS += po-docs
+endif
 
 EXTRA_DIST = \
 	$(generator_built) \
 	html/pod.css \
-	BUGS HACKING RELEASE-NOTES TODO \
+	BUGS HACKING RELEASE-NOTES ROADMAP TODO \
 	libguestfs.pc libguestfs.pc.in \
 	recipes/LICENSE \
 	recipes/README \
@@ -91,7 +93,11 @@ EXTRA_DIST = \
 	contrib/README \
 	bindtests \
 	.gitignore \
-	m4/.gitignore
+	m4/.gitignore \
+	libtool-kill-dependency_libs.sh \
+	autogen.sh \
+	bugs-in-changelog.sh \
+	update-bugs.sh
 
 # Recipes web page.
 html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
@@ -124,7 +130,7 @@ HTMLFILES = \
 	html/recipes.html \
 	html/pod.css html/recipes.css
 
-TEXTFILES = BUGS HACKING README RELEASE-NOTES TODO
+TEXTFILES = BUGS README RELEASE-NOTES ROADMAP TODO
 
 WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs
 
@@ -177,14 +183,9 @@ pkgconfig_DATA = libguestfs.pc
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA) \
-	emptydisk \
+CLEANFILES = \
 	pod2htm?.tmp \
-	html/*.html \
-	guestfs.3 guestfish.1
-
-clean-local:
-	rm -rf initramfs
+	html/*.html
 
 # 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
@@ -193,14 +194,7 @@ clean-local:
 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.
+# Make binary distribution.
 
 BINTMPDIR = /tmp/libguestfs-bin
 bindist:
@@ -208,22 +202,6 @@ bindist:
 	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
-	$(MAKE) -C cat virt-cat.static virt-filesystems.static virt-ls.static
-	cp cat/virt-cat.static $(BINTMPDIR)$(bindir)/virt-cat
-	cp cat/virt-filesystems.static $(BINTMPDIR)$(bindir)/virt-filesystems
-	cp cat/virt-ls.static $(BINTMPDIR)$(bindir)/virt-ls
-	$(MAKE) -C inspector virt-inspector.static
-	cp inspector/virt-inspector.static $(BINTMPDIR)$(bindir)/virt-inspector
 	(cd $(BINTMPDIR) && tar cf - .) | \
-	  gzip -c -9 > libguestfs-$(VERSION)-$(host_cpu).tar.gz
+	  gzip -c -9 > libguestfs-$(VERSION)-$(DISTRO)-$(host_cpu).tar.gz