X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=a4f4b0b9b475dc14994dbbed86da26e00ce1da92;hp=32853fc7949dab3528fd2555923cf8c6b56c503a;hb=429de2254176e470035eef05e0f3e9910d46863c;hpb=b9da0fe3f74e02b355aa2be961e8df3ab8b16b88

diff --git a/Makefile.am b/Makefile.am
index 32853fc..a4f4b0b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,15 +17,30 @@
 
 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
 
-if HAVE_OCAML
-SUBDIRS += ocaml
-endif
+# NB: Must build inspector directory after perl and before ocaml.
+# We could relax this if we combined the inspector_generator with
+# the ordinary generator, but that brings other problems.
 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
 if HAVE_PYTHON
 SUBDIRS += python
 endif
@@ -38,15 +53,6 @@ endif
 if HAVE_HASKELL
 SUBDIRS += haskell
 endif
-if HAVE_INSPECTOR
-SUBDIRS += inspector
-endif
-if HAVE_DF
-SUBDIRS += df
-endif
-if HAVE_CAT
-SUBDIRS += cat
-endif
 
 EXTRA_DIST = \
 	guestfs.pod guestfs-actions.pod guestfs-structs.pod \
@@ -129,10 +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
 
@@ -158,7 +175,16 @@ dist-hook:
 # Update the list of translatable files in po/POTFILES.in.
 all-local:
 	cd $(srcdir); \
-	find $(DIST_SUBDIRS) -name '*.c' -o -name '*.pl' -o -name '*.pm' | \
+	find $(DIST_SUBDIRS) \
+	    -name '*.c' -o -name '*.pl' -o -name '*.pm' -o \
+	    -name 'virt-cat' -o \
+	    -name 'virt-df' -o \
+	    -name 'virt-edit' -o \
+	    -name 'virt-inspector' -o \
+	    -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/' | \