blkid: Use -c /dev/null option to kill the cache.

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f089cb8..acd8efc 100644 (file)
--- 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 \
@@ -128,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