Rewrite virt-edit in C.

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d6b4077..b475659 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
@@ -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,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
@@ -196,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.