X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=dcd11ebdbc2496a50b5d2b82425f05bcd1037ce0;hb=3f54bd02fcf540f9b4b6edc93f3b6b9c7ba136bd;hp=c97917d1b1a7b1a665f4e3b22a951e53ac3f2e93;hpb=b646886d1aa244a32f37b19b7fb7921176d29fcd;p=libguestfs.git

diff --git a/Makefile.am b/Makefile.am
index c97917d..dcd11eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ 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
@@ -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
@@ -71,11 +71,12 @@ SUBDIRS += resize
 endif
 endif
 
-# Perl tools and guestmount.
+# Perl tools.
 if HAVE_TOOLS
 SUBDIRS += tools
 endif
 
+# guestmount
 if HAVE_FUSE
 SUBDIRS += fuse
 endif
@@ -101,6 +102,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 \
@@ -129,6 +132,7 @@ EXTRA_DIST = \
 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 \
@@ -216,7 +220,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.