Add virt-win-reg to toplevel Makefile.am, fix POTFILES.in

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 32853fc..91a2f2e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,15 +17,26 @@
 
 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_OCAML
+SUBDIRS += ocaml ocaml/examples
+endif
 if HAVE_PYTHON
 SUBDIRS += python
 endif
@@ -38,15 +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
 
 EXTRA_DIST = \
        guestfs.pod guestfs-actions.pod guestfs-structs.pod \
@@ -132,7 +134,12 @@ 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-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 +165,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/' | \