X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=ca31727836d7b559c280535de1d81654668d6d62;hp=3d629e9cdd75043d919d3643279bd7fe3ba8d81d;hb=806b6e01506dea4eae68ac3e468d9398d63cafcb;hpb=ca03635a4c83afbe9b51fe846a8b3d5361462a90

diff --git a/Makefile.am b/Makefile.am
index 3d629e9..ca31727 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,13 +30,13 @@ 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 inspector rescue
+SUBDIRS += cat df edit inspector rescue
 
 # Language bindings.
 if HAVE_PERL
@@ -52,7 +52,7 @@ if HAVE_RUBY
 SUBDIRS += ruby ruby/examples
 endif
 if HAVE_JAVA
-SUBDIRS += java
+SUBDIRS += java java/examples
 endif
 if HAVE_HASKELL
 SUBDIRS += haskell
@@ -87,39 +87,55 @@ endif
 
 EXTRA_DIST = \
 	$(generator_built) \
-	html/pod.css \
 	BUGS HACKING RELEASE-NOTES ROADMAP TODO \
-	libguestfs.pc libguestfs.pc.in \
-	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
-
-# 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 $@
+	autogen.sh \
+	bindtests \
+	contrib/README \
+	debian/.gitignore \
+	debian/changelog \
+	debian/compat \
+	debian/control \
+	debian/copyright \
+	debian/docs \
+	debian/guestfish.dirs \
+	debian/guestfish.install \
+	debian/guestfsd.dirs \
+	debian/guestfsd.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 \
+	libguestfs.pc libguestfs.pc.in \
+	libtool-kill-dependency_libs.sh \
+	logo/fish.svg logo/fish.png \
+	m4/.gitignore \
+	run \
+	update-bugs.sh
 
 HTMLFILES = \
 	html/guestfs.3.html \
 	html/guestfs-examples.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 \
@@ -139,9 +155,7 @@ HTMLFILES = \
 	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
 
@@ -205,7 +219,7 @@ CLEANFILES = \
 # is NOT a substitute for proper testing!
 
 quickcheck:
-	test-tool/run-test-tool-locally
+	./run test-tool/libguestfs-test-tool $(QUICKCHECK_TEST_TOOL_ARGS)
 
 # Make binary distribution.