tools: Specify format of disks (RHBZ#642934,CVE-2010-3851).

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ce2f940..5ab3b6d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/subdir-rules.mk
 ACLOCAL_AMFLAGS = -I m4
 
 # Basic source for the library.
-SUBDIRS = gnulib/lib images src examples po
+SUBDIRS = gnulib/lib images generator src examples po
 
 if ENABLE_DAEMON
 SUBDIRS += daemon
@@ -33,7 +33,7 @@ endif
 SUBDIRS += gnulib/tests capitests regressions test-tool
 
 # Guestfish.
-SUBDIRS += fish 
+SUBDIRS += fish
 
 # Language bindings.
 if HAVE_PERL
@@ -54,6 +54,9 @@ endif
 if HAVE_HASKELL
 SUBDIRS += haskell
 endif
+if HAVE_PHP
+SUBDIRS += php
+endif
 
 # Virt-inspector, tools and guestmount.
 if HAVE_INSPECTOR
@@ -111,10 +114,11 @@ html/guestfs.3.html: src/guestfs.pod \
          --htmldir html \
          --outfile $@
 
-html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod
+html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod fish/guestfish-commands.pod
        mkdir -p html
        sed \
          -e '/@ACTIONS@/rfish/guestfish-actions.pod' -e 's/@ACTIONS@//' \
+         -e '/@FISH_COMMANDS@/rguestfish-commands.pod' -e 's/@FISH_COMMANDS@//' \
          < $< | \
        pod2html \
          --css 'pod.css' \
@@ -209,9 +213,7 @@ clean-local:
 # is NOT a substitute for proper testing!
 
 quickcheck:
-       LIBGUESTFS_PATH=appliance \
-       test-tool/libguestfs-test-tool \
-         --helper test-tool/libguestfs-test-tool-helper
+       test-tool/run-test-tool-locally
 
 # Mostly static binary distribution.
 #