X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=f4d4dd1e3860826f66a3b47120fe882837b53e56;hp=fce4af2b05b402225c7c2dfcb478107eec971b9d;hb=984a35cfc0ae09821fb39307b98ec8399bcd8982;hpb=4bd623f6a2d83b2c27daed56f3020152a7bf31f3

diff --git a/Makefile.am b/Makefile.am
index fce4af2..f4d4dd1 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 \
@@ -172,7 +168,8 @@ all-local:
 	    -name 'virt-df' -o \
 	    -name 'virt-edit' -o \
 	    -name 'virt-inspector' -o \
-	    -name 'virt-rescue' | \
+	    -name 'virt-rescue' -o \
+	    -name 'virt-tar' | \
 	grep -v '^perl/blib/' | \
 	grep -v '^capitests/' | \
 	grep -v '^daemon/lib/' | \