X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=fcd190a1aedc04c26c5ee9133df0d83e365ca662;hb=2cac52000a6a96a583af72e289a4296c596047d5;hp=d2c90fc6052a79c9da11638fd731001d85d62edd;hpb=fc241abdbac7a016cd2fac169ad64876107df3c8;p=libguestfs.git

diff --git a/Makefile.am b/Makefile.am
index d2c90fc..fcd190a 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
@@ -40,7 +40,7 @@ SUBDIRS += cat df inspector rescue
 
 # Language bindings.
 if HAVE_PERL
-SUBDIRS += perl
+SUBDIRS += perl perl/examples
 endif
 if HAVE_OCAML
 SUBDIRS += ocaml ocaml/examples
@@ -64,6 +64,13 @@ endif
 # Unconditional because nothing is built yet.
 SUBDIRS += csharp
 
+# virt-resize 2.0 is written in OCaml.
+if HAVE_OCAML
+if HAVE_OCAML_PCRE
+SUBDIRS += resize
+endif
+endif
+
 # Perl tools and guestmount.
 if HAVE_TOOLS
 SUBDIRS += tools
@@ -74,7 +81,9 @@ SUBDIRS += fuse
 endif
 
 # po-docs must come after tools, inspector.
+if HAVE_PO4A
 SUBDIRS += po-docs
+endif
 
 EXTRA_DIST = \
 	$(generator_built) \
@@ -96,7 +105,8 @@ EXTRA_DIST = \
 	autogen.sh \
 	bugs-in-changelog.sh \
 	update-bugs.sh \
-	logo/fish.svg logo/fish.png
+	logo/fish.svg logo/fish.png \
+	run
 
 # Recipes web page.
 html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
@@ -109,6 +119,7 @@ HTMLFILES = \
 	html/guestfs.3.html \
 	html/guestfs-examples.3.html \
 	html/guestfs-ocaml.3.html \
+	html/guestfs-perl.3.html \
 	html/guestfs-python.3.html \
 	html/guestfs-ruby.3.html \
 	html/guestfish.1.html \
@@ -195,7 +206,7 @@ CLEANFILES = \
 # is NOT a substitute for proper testing!
 
 quickcheck:
-	test-tool/run-test-tool-locally
+	./run test-tool/libguestfs-test-tool
 
 # Make binary distribution.