X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=96634497b0a420a5b6a901a62b05b53accf591d1;hp=0f478a991e9087a6dcb15a016ae4ced0cc11417a;hb=4dd6b77ff7037ee220b530cefb412ace3d880f61;hpb=7801621dc946fe894c960e683db3cf921ef23af6

diff --git a/Makefile.am b/Makefile.am
index 0f478a9..9663449 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,12 +20,23 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = gnulib/lib 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_OCAML
+SUBDIRS += ocaml ocaml/examples
+endif
 if HAVE_PYTHON
 SUBDIRS += python
 endif
@@ -38,21 +49,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
-if HAVE_RESCUE
-SUBDIRS += rescue
-endif
-if HAVE_EDIT
-SUBDIRS += edit
-endif
 
 EXTRA_DIST = \
 	guestfs.pod guestfs-actions.pod guestfs-structs.pod \
@@ -138,7 +134,9 @@ html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcar
 HTMLFILES = html/guestfs.3.html html/guestfish.1.html \
 	html/virt-cat.1.html \
 	html/virt-df.1.html \
+	html/virt-edit.1.html \
 	html/virt-inspector.1.html \
+	html/virt-rescue.1.html \
 	html/recipes.html \
 	html/pod.css html/recipes.css
 
@@ -164,7 +162,15 @@ 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' | \
 	grep -v '^perl/blib/' | \
 	grep -v '^capitests/' | \
 	grep -v '^daemon/lib/' | \