Spin off hivex as a separate upstream project.

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 38beecd..c1fc85d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ 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.
@@ -69,7 +69,9 @@ EXTRA_DIST = \
        html/recipes.css \
        make-recipes.sh \
        contrib/README \
-       bindtests
+       bindtests \
+       .gitignore \
+       m4/.gitignore
 
 # HTML versions of manual pages.
 
@@ -81,11 +83,11 @@ html/guestfs.3.html: src/guestfs.pod \
                src/guestfs-structs.pod
        mkdir -p html
        sed \
-         -e '/@ACTIONS@/rguestfs-actions.pod' \
+         -e '/@ACTIONS@/rsrc/guestfs-actions.pod' \
          -e 's/@ACTIONS@//' \
-         -e '/@AVAILABILITY@/rguestfs-availability.pod' \
+         -e '/@AVAILABILITY@/rsrc/guestfs-availability.pod' \
          -e 's/@AVAILABILITY@//' \
-         -e '/@STRUCTS@/rguestfs-structs.pod' \
+         -e '/@STRUCTS@/rsrc/guestfs-structs.pod' \
          -e 's/@STRUCTS@//' \
          < $< | \
        pod2html \
@@ -97,7 +99,7 @@ html/guestfs.3.html: src/guestfs.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' \
@@ -116,9 +118,6 @@ HTMLFILES = \
        html/guestfs.3.html \
        html/guestfish.1.html \
        html/guestmount.1.html \
-       html/hivex.3.html \
-       html/hivexget.1.html \
-       html/hivexml.1.html \
        html/virt-cat.1.html \
        html/virt-df.1.html \
        html/virt-edit.1.html \
@@ -192,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