X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=acd8efc3aa86ddd4dd7f435d7673e043c5ba9ed4;hb=7b45f7d04f8eecae7ab8e3db2193dcbbd3cd839f;hp=5f441a2cc1f9310f4a636a0523cae183c5ba02b6;hpb=9bc15f5d98a3a17d465a94f42dc3ffb60c077293;p=libguestfs.git

diff --git a/Makefile.am b/Makefile.am
index 5f441a2..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,7 +30,7 @@ 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
@@ -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 \
@@ -95,7 +97,6 @@ EXTRA_DIST = \
 	libtool-kill-dependency_libs.sh \
 	autogen.sh \
 	bugs-in-changelog.sh \
-	relink-static.sh \
 	update-bugs.sh
 
 # Recipes web page.
@@ -129,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