X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=f118291f3446939de8e90e9a62e27715eb59182c;hp=3f276930f97b6e87e7995b29f32ac05a8a5404b6;hb=aa999d0586fd69094cb06ccb3ae5c429649662e0;hpb=b3595c5553035798b7b33d05c9326f7e8dd55e69

diff --git a/Makefile.am b/Makefile.am
index 3f27693..f118291 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src daemon appliance fish po examples images \
-	capitests regressions
+	capitests regressions test-tool
 
 if HAVE_OCAML
 SUBDIRS += ocaml
@@ -47,6 +47,9 @@ endif
 if HAVE_DF
 SUBDIRS += df
 endif
+if HAVE_CAT
+SUBDIRS += cat
+endif
 
 EXTRA_DIST = \
 	config.rpath \
@@ -102,6 +105,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@//' \
@@ -113,6 +117,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@//' \
 	  < $< | \
@@ -124,11 +129,13 @@ 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-inspector.1.html \
 	html/virt-v2v.1.html \
@@ -151,12 +158,15 @@ dist-hook:
 
 # Update the list of translatable files in po/POTFILES.in.
 all-local:
-	find -name '*.c' -o -name '*.pl' -o -name '*.pm' | \
-	grep -v '/blib/' | \
-	grep -v '/capitests/' | \
-	grep -v '/examples/' | \
+	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 '/guestfs_protocol.c' | \
+	grep -v '/rc_protocol.c' | \
 	sort | \
-	sed 's,^\./,,' > $(srcdir)/po/POTFILES.in
+	sed 's,^\./,,' > po/POTFILES.in
 
 # Pkgconfig.
 
@@ -165,7 +175,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