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

diff --git a/Makefile.am b/Makefile.am
index 91a2f2e..d0ad5ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+include $(top_srcdir)/subdir-rules.mk
+
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = gnulib/lib hivex src daemon appliance fish po examples images \
@@ -34,6 +36,10 @@ if HAVE_TOOLS
 SUBDIRS += tools
 endif
 
+if HAVE_FUSE
+SUBDIRS += fuse
+endif
+
 if HAVE_OCAML
 SUBDIRS += ocaml ocaml/examples
 endif
@@ -50,9 +56,16 @@ if HAVE_HASKELL
 SUBDIRS += haskell
 endif
 
+generator_built = \
+	guestfs-actions.pod \
+	guestfs-availability.pod \
+	guestfs-structs.pod \
+	guestfish-actions.pod
+
 EXTRA_DIST = \
-	guestfs.pod guestfs-actions.pod guestfs-structs.pod \
-	guestfish.pod guestfish-actions.pod \
+	$(generator_built) \
+	guestfs.pod \
+	guestfish.pod \
 	html/pod.css \
 	HACKING TODO \
 	libguestfs.pc libguestfs.pc.in \
@@ -71,15 +84,23 @@ EXTRA_DIST = \
 	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.
+# guestfs-actions.pod, guestfs-availability.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 libguestfs.3 guestfish.1
 
-guestfs.3: guestfs.pod guestfs-actions.pod guestfs-structs.pod
+guestfs.3: guestfs.pod \
+		guestfs-actions.pod \
+		guestfs-availability.pod \
+		guestfs-structs.pod
 	sed \
-	  -e '/@ACTIONS@/rguestfs-actions.pod' -e 's/@ACTIONS@//' \
-	  -e '/@STRUCTS@/rguestfs-structs.pod' -e 's/@STRUCTS@//' \
+	  -e '/@ACTIONS@/rguestfs-actions.pod' \
+	  -e 's/@ACTIONS@//' \
+	  -e '/@AVAILABILITY@/rguestfs-availability.pod' \
+	  -e 's/@AVAILABILITY@//' \
+	  -e '/@STRUCTS@/rguestfs-structs.pod' \
+	  -e 's/@STRUCTS@//' \
 	  < $< | \
 	$(POD2MAN) \
 	  --section 3 \
@@ -101,11 +122,18 @@ 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
+html/guestfs.3.html: guestfs.pod \
+		guestfs-actions.pod \
+		guestfs-availability.pod \
+		guestfs-structs.pod
 	mkdir -p html
 	sed \
-	  -e '/@ACTIONS@/rguestfs-actions.pod' -e 's/@ACTIONS@//' \
-	  -e '/@STRUCTS@/rguestfs-structs.pod' -e 's/@STRUCTS@//' \
+	  -e '/@ACTIONS@/rguestfs-actions.pod' \
+	  -e 's/@ACTIONS@//' \
+	  -e '/@AVAILABILITY@/rguestfs-availability.pod' \
+	  -e 's/@AVAILABILITY@//' \
+	  -e '/@STRUCTS@/rguestfs-structs.pod' \
+	  -e 's/@STRUCTS@//' \
 	  < $< | \
 	pod2html \
 	  --css 'pod.css' \
@@ -131,11 +159,18 @@ html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcar
 	sh make-recipes.sh recipes/*.sh > $@-t
 	mv $@-t $@
 
-HTMLFILES = html/guestfs.3.html html/guestfish.1.html \
+HTMLFILES = \
+	html/guestfs.3.html \
+	html/guestfish.1.html \
+	html/guestmount.1.html \
+	html/hivex.3.html \
+	html/hivexget.1.html \
+	html/hivexml.1.html \
 	html/virt-cat.1.html \
 	html/virt-df.1.html \
 	html/virt-edit.1.html \
 	html/virt-inspector.1.html \
+	html/virt-list-filesystems.1.html \
 	html/virt-ls.1.html \
 	html/virt-rescue.1.html \
 	html/virt-tar.1.html \
@@ -171,6 +206,7 @@ all-local:
 	    -name 'virt-df' -o \
 	    -name 'virt-edit' -o \
 	    -name 'virt-inspector' -o \
+	    -name 'virt-list-filesystems' -o \
 	    -name 'virt-ls' -o \
 	    -name 'virt-rescue' -o \
 	    -name 'virt-tar' -o \
@@ -184,6 +220,7 @@ all-local:
 	grep -v '^perl/examples/' | \
 	grep -v '/guestfs_protocol.c' | \
 	grep -v '/rc_protocol.c' | \
+	grep -v 'appliance/debian/root' | \
 	LC_ALL=C sort | \
 	sed 's,^\./,,' > po/POTFILES.in