X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=043e84a37342c4056dbd3262ce0cc37173389250;hp=3cba8bc3d01f0ded5aa55ea7fe9f2230015568b8;hb=1b21ed4f5d9307e87fad094ec177c90d5adb91ce;hpb=e6a3836772a6e9a769539b29e9988aaa5f140d40

diff --git a/Makefile.am b/Makefile.am
index 3cba8bc..043e84a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src daemon appliance fish po examples images \
-	capitests regressions test-tool
+SUBDIRS = gnulib/lib src daemon appliance fish po examples images \
+	gnulib/tests capitests regressions test-tool
 
 if HAVE_OCAML
 SUBDIRS += ocaml
@@ -41,24 +41,22 @@ endif
 if HAVE_INSPECTOR
 SUBDIRS += inspector
 endif
-if HAVE_V2V
-SUBDIRS += v2v
-endif
 if HAVE_DF
 SUBDIRS += df
 endif
 if HAVE_CAT
 SUBDIRS += cat
 endif
+if HAVE_RESCUE
+SUBDIRS += rescue
+endif
 
 EXTRA_DIST = \
-	config.rpath \
 	guestfs.pod guestfs-actions.pod guestfs-structs.pod \
 	guestfish.pod guestfish-actions.pod \
 	html/pod.css \
 	HACKING TODO \
 	libguestfs.pc libguestfs.pc.in \
-	gitlog-to-changelog \
 	recipes/LICENSE \
 	recipes/README \
 	recipes/*.html \
@@ -138,7 +136,6 @@ HTMLFILES = html/guestfs.3.html html/guestfish.1.html \
 	html/virt-cat.1.html \
 	html/virt-df.1.html \
 	html/virt-inspector.1.html \
-	html/virt-v2v.1.html \
 	html/recipes.html \
 	html/pod.css html/recipes.css
 
@@ -149,20 +146,29 @@ 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.
 
 dist-hook:
-	./gitlog-to-changelog > ChangeLog
+	$(top_srcdir)/build-aux/gitlog-to-changelog > ChangeLog
 	cp ChangeLog $(distdir)/ChangeLog
 
 # 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 'examples/' | \
+	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 | \