Spin off hivex as a separate upstream project.

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0b905ca..c1fc85d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,9 +15,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = gnulib/lib hivex src daemon appliance fish po examples images \
+SUBDIRS = gnulib/lib src daemon appliance fish po examples images \
        gnulib/tests capitests regressions test-tool
 
 # NB: Must build inspector directory after perl and before ocaml.
@@ -34,6 +36,10 @@ if HAVE_TOOLS
 SUBDIRS += tools
 endif
 
+if HAVE_FUSE
+SUBDIRS += fuse
+endif
+
 if HAVE_OCAML
 SUBDIRS += ocaml ocaml/examples
 endif
@@ -51,8 +57,7 @@ SUBDIRS += haskell
 endif
 
 EXTRA_DIST = \
-       guestfs.pod guestfs-actions.pod guestfs-structs.pod \
-       guestfish.pod guestfish-actions.pod \
+       $(generator_built) \
        html/pod.css \
        HACKING TODO \
        libguestfs.pc libguestfs.pc.in \
@@ -64,48 +69,26 @@ EXTRA_DIST = \
        html/recipes.css \
        make-recipes.sh \
        contrib/README \
-       contrib/febootstrap/install.title \
-       contrib/febootstrap/install.html \
-       contrib/febootstrap/install.sh \
        bindtests \
-       libguestfs.3
+       .gitignore \
+       m4/.gitignore
 
-# Manual pages.
-# guestfs-actions.pod and guestfs-structs are autogenerated.  There is
-# no include mechanism for POD, so we have to do it by hand.
-
-man_MANS = guestfs.3 libguestfs.3 guestfish.1
-
-guestfs.3: guestfs.pod guestfs-actions.pod guestfs-structs.pod
-       sed \
-         -e '/@ACTIONS@/rguestfs-actions.pod' -e 's/@ACTIONS@//' \
-         -e '/@STRUCTS@/rguestfs-structs.pod' -e 's/@STRUCTS@//' \
-         < $< | \
-       $(POD2MAN) \
-         --section 3 \
-         -c "Virtualization Support" \
-         --name "guestfs" \
-         --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
-         > $@
-
-guestfish.1: guestfish.pod guestfish-actions.pod
-       sed \
-         -e '/@ACTIONS@/rguestfish-actions.pod' -e 's/@ACTIONS@//' \
-         < $< | \
-       $(POD2MAN) \
-         --section 1 \
-         -c "Virtualization Support" \
-         --name "guestfish" \
-         --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
-         > $@
+# HTML versions of manual pages.
 
 noinst_DATA = html/guestfs.3.html html/guestfish.1.html
 
-html/guestfs.3.html: guestfs.pod guestfs-actions.pod guestfs-structs.pod
+html/guestfs.3.html: src/guestfs.pod \
+               src/guestfs-actions.pod \
+               src/guestfs-availability.pod \
+               src/guestfs-structs.pod
        mkdir -p html
        sed \
-         -e '/@ACTIONS@/rguestfs-actions.pod' -e 's/@ACTIONS@//' \
-         -e '/@STRUCTS@/rguestfs-structs.pod' -e 's/@STRUCTS@//' \
+         -e '/@ACTIONS@/rsrc/guestfs-actions.pod' \
+         -e 's/@ACTIONS@//' \
+         -e '/@AVAILABILITY@/rsrc/guestfs-availability.pod' \
+         -e 's/@AVAILABILITY@//' \
+         -e '/@STRUCTS@/rsrc/guestfs-structs.pod' \
+         -e 's/@STRUCTS@//' \
          < $< | \
        pod2html \
          --css 'pod.css' \
@@ -113,10 +96,10 @@ html/guestfs.3.html: guestfs.pod guestfs-actions.pod guestfs-structs.pod
          --htmldir html \
          --outfile $@
 
-html/guestfish.1.html: guestfish.pod guestfish-actions.pod
+html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod
        mkdir -p html
        sed \
-         -e '/@ACTIONS@/rguestfish-actions.pod' -e 's/@ACTIONS@//' \
+         -e '/@ACTIONS@/rfish/guestfish-actions.pod' -e 's/@ACTIONS@//' \
          < $< | \
        pod2html \
          --css 'pod.css' \
@@ -134,13 +117,12 @@ html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcar
 HTMLFILES = \
        html/guestfs.3.html \
        html/guestfish.1.html \
-       html/hivex.3.html \
-       html/hivexget.1.html \
-       html/hivexml.1.html \
+       html/guestmount.1.html \
        html/virt-cat.1.html \
        html/virt-df.1.html \
        html/virt-edit.1.html \
        html/virt-inspector.1.html \
+       html/virt-list-filesystems.1.html \
        html/virt-ls.1.html \
        html/virt-rescue.1.html \
        html/virt-tar.1.html \
@@ -176,6 +158,7 @@ all-local:
            -name 'virt-df' -o \
            -name 'virt-edit' -o \
            -name 'virt-inspector' -o \
+           -name 'virt-list-filesystems' -o \
            -name 'virt-ls' -o \
            -name 'virt-rescue' -o \
            -name 'virt-tar' -o \
@@ -189,6 +172,7 @@ all-local:
        grep -v '^perl/examples/' | \
        grep -v '/guestfs_protocol.c' | \
        grep -v '/rc_protocol.c' | \
+       grep -v 'appliance/debian/root' | \
        LC_ALL=C sort | \
        sed 's,^\./,,' > po/POTFILES.in
 
@@ -207,3 +191,12 @@ CLEANFILES = $(fs_DATA) \
 
 clean-local:
        rm -rf initramfs
+
+# If you don't want to run all of the tests ('make check') then this
+# will just run libguestfs-test-tool for a quick check.  Note this
+# is NOT a substitute for proper testing!
+
+quickcheck:
+       LIBGUESTFS_PATH=appliance \
+       test-tool/libguestfs-test-tool \
+         --helper test-tool/libguestfs-test-tool-helper