X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=91a2f2e40a65c976df047b7d7f3126b12c05522a;hp=55b20ba9affad7310d74507a4b3ca6ff24c7b6bf;hb=e02f42cb1d7f60c9d2f020d7d8c1b5316fb61310;hpb=e2206733d1287f5809dbde954f3eb64420471b0d

diff --git a/Makefile.am b/Makefile.am
index 55b20ba..91a2f2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,14 +17,26 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src daemon appliance fish po examples images capitests
+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
@@ -37,18 +49,13 @@ endif
 if HAVE_HASKELL
 SUBDIRS += haskell
 endif
-if HAVE_INSPECTOR
-SUBDIRS += inspector
-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 \
@@ -59,13 +66,15 @@ EXTRA_DIST = \
 	contrib/README \
 	contrib/febootstrap/install.title \
 	contrib/febootstrap/install.html \
-	contrib/febootstrap/install.sh
+	contrib/febootstrap/install.sh \
+	bindtests \
+	libguestfs.3
 
 # Manual pages.
 # guestfs-actions.pod and guestfs-structs are autogenerated.  There is
 # no include mechanism for POD, so we have to do it by hand.
 
-man_MANS = guestfs.3 guestfish.1
+man_MANS = guestfs.3 libguestfs.3 guestfish.1
 
 guestfs.3: guestfs.pod guestfs-actions.pod guestfs-structs.pod
 	sed \
@@ -93,6 +102,7 @@ guestfish.1: guestfish.pod guestfish-actions.pod
 noinst_DATA = html/guestfs.3.html html/guestfish.1.html
 
 html/guestfs.3.html: guestfs.pod guestfs-actions.pod guestfs-structs.pod
+	mkdir -p html
 	sed \
 	  -e '/@ACTIONS@/rguestfs-actions.pod' -e 's/@ACTIONS@//' \
 	  -e '/@STRUCTS@/rguestfs-structs.pod' -e 's/@STRUCTS@//' \
@@ -104,6 +114,7 @@ html/guestfs.3.html: guestfs.pod guestfs-actions.pod guestfs-structs.pod
 	  --outfile $@
 
 html/guestfish.1.html: guestfish.pod guestfish-actions.pod
+	mkdir -p html
 	sed \
 	  -e '/@ACTIONS@/rguestfish-actions.pod' -e 's/@ACTIONS@//' \
 	  < $< | \
@@ -115,29 +126,67 @@ html/guestfish.1.html: guestfish.pod guestfish-actions.pod
 
 # Recipes web page.
 html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
+	mkdir -p html
 	rm -f $@ $@-t
 	sh make-recipes.sh recipes/*.sh > $@-t
 	mv $@-t $@
 
 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
 
 TEXTFILES = README TODO HACKING
 
-WEBSITEDIR = $(HOME)/d/redhat/et-website/libguestfs
+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' -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/' | \
+	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.
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -145,7 +194,11 @@ pkgconfig_DATA = libguestfs.pc
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp
+CLEANFILES = $(fs_DATA) \
+	emptydisk \
+	pod2htm?.tmp \
+	html/*.html \
+	guestfs.3 guestfish.1
 
 clean-local:
 	rm -rf initramfs