New tool: virt-tar

[libguestfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8fed9ec..f4d4dd1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,17 +15,28 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
+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,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,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
 
@@ -143,6 +147,11 @@ WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs
 website: $(HTMLFILES) $(TEXTFILES)
        cp $(HTMLFILES) $(WEBSITEDIR)
        for f in $(TEXTFILES); do cp $$f $(WEBSITEDIR)/$$f.txt; done
+       cd $(WEBSITEDIR) && \
+       date=`date +%F`; \
+       sed -e "s/SUBST_VERSION/$(VERSION)/" \
+           -e "s/SUBST_DATE/$$date/" \
+       < index.html.in > index.html
 
 # Generate the ChangeLog automatically from the gitlog.
 
@@ -153,12 +162,21 @@ 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' | \
-       grep -v 'perl/blib/' | \
-       grep -v 'capitests/' | \
-       grep -v 'daemon/lib/' | \
-       grep -v 'daemon/tests/' | \
-       grep -v 'examples/' | \
+       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-rescue' -o \
+           -name 'virt-tar' | \
+       grep -v '^perl/blib/' | \
+       grep -v '^capitests/' | \
+       grep -v '^daemon/lib/' | \
+       grep -v '^daemon/tests/' | \
+       grep -v '^examples/' | \
+       grep -v '^gnulib/' | \
+       grep -v '^perl/examples/' | \
        grep -v '/guestfs_protocol.c' | \
        grep -v '/rc_protocol.c' | \
        LC_ALL=C sort | \