X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=a7197d4b4c3ccdf402a0b118418ee27d99c2f0c8;hb=d37f69795396ec2354eb2d8480d64b9e5bdafacc;hp=c4ca1e0d6c555b56e984337c0dcdf4c1b91639c0;hpb=811b4a51dc25219e19527304892e7f688867e105;p=libguestfs.git

diff --git a/Makefile.am b/Makefile.am
index c4ca1e0..a7197d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,15 +17,18 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src daemon appliance fish po examples images \
-	capitests regressions
+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,27 +41,25 @@ endif
 if HAVE_HASKELL
 SUBDIRS += haskell
 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
+if HAVE_EDIT
+SUBDIRS += edit
+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 \
@@ -137,8 +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-v2v.1.html \
+	html/virt-rescue.1.html \
 	html/recipes.html \
 	html/pod.css html/recipes.css
 
@@ -149,21 +151,38 @@ 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 -name '*.c' -o -name '*.pl' -o -name '*.pm' | \
-	grep -v '/blib/' | \
-	grep -v '/capitests/' | \
-	grep -v '/examples/' | \
-	sort | \
+	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 | \
 	sed 's,^\./,,' > po/POTFILES.in
 
 # Pkgconfig.
@@ -176,8 +195,8 @@ pkgconfig_DATA = libguestfs.pc
 CLEANFILES = $(fs_DATA) \
 	emptydisk \
 	pod2htm?.tmp \
-	$(HTMLFILES) \
-	$(man_MANS)
+	html/*.html \
+	guestfs.3 guestfish.1
 
 clean-local:
 	rm -rf initramfs