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

diff --git a/Makefile.am b/Makefile.am
index 5f441a2..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,12 +81,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,8 +104,9 @@ EXTRA_DIST = \
 	libtool-kill-dependency_libs.sh \
 	autogen.sh \
 	bugs-in-changelog.sh \
-	relink-static.sh \
-	update-bugs.sh
+	update-bugs.sh \
+	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,11 +119,14 @@ 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 \
 	html/guestmount.1.html \
 	html/virt-cat.1.html \
+	html/virt-copy-in.1.html \
+	html/virt-copy-out.1.html \
 	html/virt-df.1.html \
 	html/virt-edit.1.html \
 	html/virt-filesystems.1.html \
@@ -125,11 +138,13 @@ HTMLFILES = \
 	html/virt-rescue.1.html \
 	html/virt-resize.1.html \
 	html/virt-tar.1.html \
+	html/virt-tar-in.1.html \
+	html/virt-tar-out.1.html \
 	html/virt-win-reg.1.html \
 	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
 
@@ -191,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.