X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=87efb2dc535623652f98aeb9cec1e60a753da798;hp=c4a84f788f960b4a124b0416aa0b265ba452d5d5;hb=9a8889e4d0c532b9f77af3a9cc7aae06adebfb83;hpb=854f8e0d5643e55d045f5816a520d49a057990ef

diff --git a/Makefile.am b/Makefile.am
index c4a84f7..87efb2d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = gnulib/lib src daemon appliance fish po examples images \
+SUBDIRS = gnulib/lib hivex src daemon appliance fish po examples images \
 	gnulib/tests capitests regressions test-tool
 
 # NB: Must build inspector directory after perl and before ocaml.
@@ -26,9 +26,18 @@ SUBDIRS = gnulib/lib src daemon appliance fish po examples images \
 if HAVE_PERL
 SUBDIRS += perl
 endif
+
 if HAVE_INSPECTOR
 SUBDIRS += inspector
 endif
+if HAVE_TOOLS
+SUBDIRS += tools
+endif
+
+if HAVE_FUSE
+SUBDIRS += fuse
+endif
+
 if HAVE_OCAML
 SUBDIRS += ocaml ocaml/examples
 endif
@@ -44,18 +53,6 @@ endif
 if HAVE_HASKELL
 SUBDIRS += haskell
 endif
-if HAVE_DF
-SUBDIRS += df
-endif
-if HAVE_CAT
-SUBDIRS += cat
-endif
-if HAVE_RESCUE
-SUBDIRS += rescue
-endif
-if HAVE_EDIT
-SUBDIRS += edit
-endif
 
 EXTRA_DIST = \
 	guestfs.pod guestfs-actions.pod guestfs-structs.pod \
@@ -138,12 +135,21 @@ html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcar
 	sh make-recipes.sh recipes/*.sh > $@-t
 	mv $@-t $@
 
-HTMLFILES = html/guestfs.3.html html/guestfish.1.html \
+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 \
 	html/virt-inspector.1.html \
+	html/virt-ls.1.html \
 	html/virt-rescue.1.html \
+	html/virt-tar.1.html \
+	html/virt-win-reg.1.html \
 	html/recipes.html \
 	html/pod.css html/recipes.css
 
@@ -175,7 +181,10 @@ all-local:
 	    -name 'virt-df' -o \
 	    -name 'virt-edit' -o \
 	    -name 'virt-inspector' -o \
-	    -name 'virt-rescue' | \
+	    -name 'virt-ls' -o \
+	    -name 'virt-rescue' -o \
+	    -name 'virt-tar' -o \
+	    -name 'virt-win-reg' | \
 	grep -v '^perl/blib/' | \
 	grep -v '^capitests/' | \
 	grep -v '^daemon/lib/' | \
@@ -185,6 +194,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