X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=a53475061d69e922e66429b8d7600fdbaa772259;hp=a33c91c378b8247d6024ac7bff3a0b741783e2b9;hb=e3acf93ce9e87ce308cf50a4f41408b25dd910e9;hpb=a0d514f13d3334b79745d7d1f90a6ac615afa7c2

diff --git a/Makefile.am b/Makefile.am
index a33c91c..a534750 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/subdir-rules.mk
 ACLOCAL_AMFLAGS = -I m4
 
 # Basic source for the library.
-SUBDIRS = gnulib/lib images src examples po
+SUBDIRS = gnulib/lib images generator src examples po
 
 if ENABLE_DAEMON
 SUBDIRS += daemon
@@ -33,7 +33,7 @@ endif
 SUBDIRS += gnulib/tests capitests regressions test-tool
 
 # Guestfish.
-SUBDIRS += fish 
+SUBDIRS += fish
 
 # Language bindings.
 if HAVE_PERL
@@ -54,6 +54,12 @@ endif
 if HAVE_HASKELL
 SUBDIRS += haskell
 endif
+if HAVE_PHP
+SUBDIRS += php
+endif
+
+# Unconditional because nothing is built yet.
+SUBDIRS += csharp
 
 # Virt-inspector, tools and guestmount.
 if HAVE_INSPECTOR
@@ -68,6 +74,9 @@ if HAVE_FUSE
 SUBDIRS += fuse
 endif
 
+# po-docs must come after tools, inspector.
+SUBDIRS += po-docs
+
 EXTRA_DIST = \
 	$(generator_built) \
 	html/pod.css \
@@ -108,10 +117,11 @@ html/guestfs.3.html: src/guestfs.pod \
 	  --htmldir html \
 	  --outfile $@
 
-html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod
+html/guestfish.1.html: fish/guestfish.pod fish/guestfish-actions.pod fish/guestfish-commands.pod
 	mkdir -p html
 	sed \
 	  -e '/@ACTIONS@/rfish/guestfish-actions.pod' -e 's/@ACTIONS@//' \
+	  -e '/@FISH_COMMANDS@/rfish/guestfish-commands.pod' -e 's/@FISH_COMMANDS@//' \
 	  < $< | \
 	pod2html \
 	  --css 'pod.css' \
@@ -145,7 +155,7 @@ HTMLFILES = \
 	html/recipes.html \
 	html/pod.css html/recipes.css
 
-TEXTFILES = README TODO HACKING
+TEXTFILES = BUGS HACKING README RELEASE-NOTES TODO
 
 WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs
 
@@ -165,6 +175,12 @@ dist-hook:
 	$(top_srcdir)/update-bugs > BUGS-t
 	mv BUGS-t BUGS
 	cp BUGS $(distdir)/BUGS
+	git log --pretty="format:%an" | sort -u | \
+		grep -v rjones | \
+		grep -v "Richard Jones" \
+		> AUTHORS-t
+	mv AUTHORS-t AUTHORS
+	cp AUTHORS $(distdir)/AUTHORS
 
 # Update the list of translatable files in po/POTFILES.in.
 all-local:
@@ -181,6 +197,7 @@ all-local:
 	grep -v '/guestfs_protocol.c' | \
 	grep -v '/rc_protocol.c' | \
 	grep -v 'appliance/debian/root' | \
+	grep -v '^po-docs/' | \
 	LC_ALL=C sort | \
 	sed 's,^\./,,' > po/POTFILES.in
 
@@ -205,9 +222,7 @@ clean-local:
 # is NOT a substitute for proper testing!
 
 quickcheck:
-	LIBGUESTFS_PATH=appliance \
-	test-tool/libguestfs-test-tool \
-	  --helper test-tool/libguestfs-test-tool-helper
+	test-tool/run-test-tool-locally
 
 # Mostly static binary distribution.
 #