X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=a7197d4b4c3ccdf402a0b118418ee27d99c2f0c8;hp=8fed9ec1fbe1b53bb91fff1c4f12eccdc49c500c;hb=d37f69795396ec2354eb2d8480d64b9e5bdafacc;hpb=7faff93c3cd2143ee20127f75625f5c520b9d787

diff --git a/Makefile.am b/Makefile.am
index 8fed9ec..a7197d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,17 +15,20 @@
 # 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
 if HAVE_PERL
 SUBDIRS += perl
 endif
+if HAVE_INSPECTOR
+SUBDIRS += inspector
+endif
+if HAVE_OCAML
+SUBDIRS += ocaml ocaml/examples
+endif
 if HAVE_PYTHON
 SUBDIRS += python
 endif
@@ -38,15 +41,18 @@ 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 \
@@ -132,7 +138,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 +151,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 +166,20 @@ 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' | \
+	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 | \