X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=60343f8c3ad2ee0ec757c0560e0182a629d88519;hp=308a1f3e14edec7b1309c3b427fa6b6828878c58;hb=f93e8dbb78794029dcc51e8b0d77b5ed4eadac5e;hpb=c6be95453d66ea714a9813a21cfb224d8e346d9e

diff --git a/Makefile.am b/Makefile.am
index 308a1f3..60343f8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,10 +69,7 @@ SUBDIRS += csharp
 
 # virt-resize (new version) and virt-sparsify are written in OCaml.
 if HAVE_OCAML
-if HAVE_OCAML_PCRE
-SUBDIRS += resize
-endif
-SUBDIRS += sparsify
+SUBDIRS += resize sparsify
 endif
 
 # Perl tools.
@@ -85,6 +82,11 @@ if HAVE_FUSE
 SUBDIRS += fuse
 endif
 
+# virt-tools in shell.  This uses guestmount and virt-inspector.
+if HAVE_FUSE
+SUBDIRS += clone
+endif
+
 # po-docs must come after tools, inspector.
 if HAVE_PO4A
 SUBDIRS += po-docs
@@ -97,7 +99,23 @@ EXTRA_DIST = \
 	bugs-in-changelog.sh \
 	autogen.sh \
 	bindtests \
+	contrib/autobuild/autobuild.sh \
+	contrib/guestfsd-in-wine.sh \
+	contrib/intro/libguestfs-intro.html \
+	contrib/intro/overview.svg \
+	contrib/intro/talk.txt \
+	contrib/intro/tools.svg \
 	contrib/README \
+	contrib/visualize-alignment/.gitignore \
+	contrib/visualize-alignment/guestfish-add-mount.qtr \
+	contrib/visualize-alignment/guestfish-lv-ext4-4k.qtr \
+	contrib/visualize-alignment/guestfish-lv-ext4-4k-write-hello.qtr \
+	contrib/visualize-alignment/guestfish-N-fs-10M-aligned-part-disk.qtr \
+	contrib/visualize-alignment/guestfish-N-fs-10M.qtr \
+	contrib/visualize-alignment/guestfish-write-hello.qtr \
+	contrib/visualize-alignment/qemu-0.13-trace-block-device-access.patch \
+	contrib/visualize-alignment/README \
+	contrib/visualize-alignment/tracetops.ml \
 	debian/.gitignore \
 	debian/changelog \
 	debian/compat \
@@ -160,6 +178,7 @@ HTMLFILES = \
 	html/virt-rescue.1.html \
 	html/virt-resize.1.html \
 	html/virt-sparsify.1.html \
+	html/virt-sysprep.1.html \
 	html/virt-tar.1.html \
 	html/virt-tar-in.1.html \
 	html/virt-tar-out.1.html \