X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=37564093d8895ceb81c821e20fed7f543a3acb98;hb=34acb80a28d1b48e734883a32f7f3344dc216ec0;hp=d6b4077abd6b81b0998b62d8b319185ad462763f;hpb=477eebc83dcd33d00d34398692692dae6af04f22;p=libguestfs.git

diff --git a/Makefile.am b/Makefile.am
index d6b4077..3756409 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
@@ -36,7 +36,7 @@ SUBDIRS += gnulib/tests capitests regressions test-tool
 SUBDIRS += fish
 
 # virt-tools in C.
-SUBDIRS += cat df inspector rescue
+SUBDIRS += cat df edit inspector rescue
 
 # Language bindings.
 if HAVE_PERL
@@ -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,29 +81,57 @@ 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 ROADMAP TODO \
+	.gitignore \
+	bugs-in-changelog.sh \
+	autogen.sh \
+	bindtests \
+	contrib/README \
+	debian/.gitignore \
+	debian/changelog \
+	debian/compat \
+	debian/control \
+	debian/copyright \
+	debian/docs \
+	debian/guestfish.dirs \
+	debian/guestfish.install \
+	debian/guestmount.dirs \
+	debian/guestmount.install \
+	debian/libguestfs-dev.dirs \
+	debian/libguestfs-dev.install \
+	debian/libguestfs-doc.docs \
+	debian/libguestfs-perl.examples \
+	debian/libguestfs-perl.install \
+	debian/libguestfs-tools.dirs \
+	debian/libguestfs-tools.install \
+	debian/libguestfs0.dirs \
+	debian/libguestfs0.install \
+	debian/patches/series \
+	debian/python-guestfs.install \
+	debian/pyversions \
+	debian/rules \
+	debian/shlibs.local \
+	debian/watch \
+	html/pod.css \
+	html/recipes.css \
 	libguestfs.pc libguestfs.pc.in \
+	libtool-kill-dependency_libs.sh \
+	logo/fish.svg logo/fish.png \
+	make-recipes.sh \
+	m4/.gitignore \
 	recipes/LICENSE \
 	recipes/README \
 	recipes/*.html \
 	recipes/*.sh \
 	recipes/*.example \
-	html/recipes.css \
-	make-recipes.sh \
-	contrib/README \
-	bindtests \
-	.gitignore \
-	m4/.gitignore \
-	libtool-kill-dependency_libs.sh \
-	autogen.sh \
-	bugs-in-changelog.sh \
-	update-bugs.sh \
-	logo/fish.svg logo/fish.png
+	run \
+	update-bugs.sh
 
 # Recipes web page.
 html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
@@ -196,7 +231,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.