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
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 \
-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' | \
grep -v '^perl/blib/' | \
grep -v '^capitests/' | \
grep -v '^daemon/lib/' | \