X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=3d44c76a3d6fc26c81a16914c288bdeb8dc6c34c;hp=37564093d8895ceb81c821e20fed7f543a3acb98;hb=1e35941f62bddafd6b88270b22b3afe4a5d37baa;hpb=91ea9c1805112233140a463256c89072121fc182

diff --git a/Makefile.am b/Makefile.am
index 3756409..3d44c76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,13 +30,16 @@ SUBDIRS += appliance
 endif
 
 # Tests and the test-tool.
-SUBDIRS += gnulib/tests capitests regressions test-tool
+SUBDIRS += gnulib/tests capitests caution regressions test-tool
 
 # Guestfish.
 SUBDIRS += fish
 
 # virt-tools in C.
-SUBDIRS += cat df edit inspector rescue
+SUBDIRS += align cat df edit inspector rescue
+
+# virt-tools in shell.
+SUBDIRS += clone
 
 # Language bindings.
 if HAVE_PERL
@@ -52,7 +55,7 @@ if HAVE_RUBY
 SUBDIRS += ruby ruby/examples
 endif
 if HAVE_JAVA
-SUBDIRS += java
+SUBDIRS += java java/examples
 endif
 if HAVE_HASKELL
 SUBDIRS += haskell
@@ -60,22 +63,27 @@ endif
 if HAVE_PHP
 SUBDIRS += php
 endif
+if HAVE_ERLANG
+SUBDIRS += erlang erlang/examples
+endif
 
 # Unconditional because nothing is built yet.
 SUBDIRS += csharp
 
-# virt-resize 2.0 is written in OCaml.
+# virt-resize (new version) and virt-sparsify are written in OCaml.
 if HAVE_OCAML
 if HAVE_OCAML_PCRE
 SUBDIRS += resize
 endif
+SUBDIRS += sparsify
 endif
 
-# Perl tools and guestmount.
+# Perl tools.
 if HAVE_TOOLS
 SUBDIRS += tools
 endif
 
+# guestmount
 if HAVE_FUSE
 SUBDIRS += fuse
 endif
@@ -101,6 +109,8 @@ EXTRA_DIST = \
 	debian/docs \
 	debian/guestfish.dirs \
 	debian/guestfish.install \
+	debian/guestfsd.dirs \
+	debian/guestfsd.install \
 	debian/guestmount.dirs \
 	debian/guestmount.install \
 	debian/libguestfs-dev.dirs \
@@ -119,36 +129,26 @@ EXTRA_DIST = \
 	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 \
 	run \
 	update-bugs.sh
 
-# Recipes web page.
-html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
-	mkdir -p html
-	rm -f $@ $@-t
-	sh make-recipes.sh recipes/*.sh > $@-t
-	mv $@-t $@
-
 HTMLFILES = \
 	html/guestfs.3.html \
 	html/guestfs-examples.3.html \
+	html/guestfs-erlang.3.html \
+	html/guestfs-java.3.html \
 	html/guestfs-ocaml.3.html \
 	html/guestfs-perl.3.html \
 	html/guestfs-python.3.html \
+	html/guestfs-recipes.1.html \
 	html/guestfs-ruby.3.html \
 	html/guestfish.1.html \
 	html/guestmount.1.html \
+	html/virt-alignment-scan.1.html \
 	html/virt-cat.1.html \
 	html/virt-copy-in.1.html \
 	html/virt-copy-out.1.html \
@@ -162,12 +162,12 @@ HTMLFILES = \
 	html/virt-make-fs.1.html \
 	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 \
-	html/virt-win-reg.1.html \
-	html/recipes.html \
-	html/pod.css html/recipes.css
+	html/virt-win-reg.1.html
 
 TEXTFILES = BUGS README RELEASE-NOTES ROADMAP TODO
 
@@ -231,7 +231,7 @@ CLEANFILES = \
 # is NOT a substitute for proper testing!
 
 quickcheck:
-	./run test-tool/libguestfs-test-tool
+	./run test-tool/libguestfs-test-tool $(QUICKCHECK_TEST_TOOL_ARGS)
 
 # Make binary distribution.