X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=Makefile.am;h=bfca6a1ed8c3020e5179edfc5f147fa8cc3b3c8b;hp=837198441cad3273a7018d55db2f4e42c988ea05;hb=4cf4f2b66f850bb39c5bf29d3cd12ada9114d67e;hpb=472722a72df89895bb11a1244eafa7915b1af116

diff --git a/Makefile.am b/Makefile.am
index 8371984..bfca6a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ SUBDIRS += gnulib/tests capitests regressions test-tool
 SUBDIRS += fish
 
 # virt-tools in C.
-SUBDIRS += cat inspector
+SUBDIRS += cat df inspector rescue
 
 # Language bindings.
 if HAVE_PERL
@@ -49,7 +49,7 @@ if HAVE_PYTHON
 SUBDIRS += python python/examples
 endif
 if HAVE_RUBY
-SUBDIRS += ruby
+SUBDIRS += ruby ruby/examples
 endif
 if HAVE_JAVA
 SUBDIRS += java
@@ -91,7 +91,8 @@ EXTRA_DIST = \
 	contrib/README \
 	bindtests \
 	.gitignore \
-	m4/.gitignore
+	m4/.gitignore \
+	libtool-kill-dependency_libs.sh
 
 # Recipes web page.
 html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
@@ -105,6 +106,7 @@ HTMLFILES = \
 	html/guestfs-examples.3.html \
 	html/guestfs-ocaml.3.html \
 	html/guestfs-python.3.html \
+	html/guestfs-ruby.3.html \
 	html/guestfish.1.html \
 	html/guestmount.1.html \
 	html/virt-cat.1.html \
@@ -176,11 +178,9 @@ pkgconfig_DATA = libguestfs.pc
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA) \
-	emptydisk \
+CLEANFILES = \
 	pod2htm?.tmp \
-	html/*.html \
-	guestfs.3 guestfish.1
+	html/*.html
 
 clean-local:
 	rm -rf initramfs
@@ -222,7 +222,11 @@ bindist:
 	cp cat/virt-cat.static $(BINTMPDIR)$(bindir)/virt-cat
 	cp cat/virt-filesystems.static $(BINTMPDIR)$(bindir)/virt-filesystems
 	cp cat/virt-ls.static $(BINTMPDIR)$(bindir)/virt-ls
+	$(MAKE) -C df virt-df.static
+	cp df/virt-df.static $(BINTMPDIR)$(bindir)/virt-df
 	$(MAKE) -C inspector virt-inspector.static
 	cp inspector/virt-inspector.static $(BINTMPDIR)$(bindir)/virt-inspector
+	$(MAKE) -C rescue virt-rescue.static
+	cp rescue/virt-rescue.static $(BINTMPDIR)$(bindir)/virt-rescue
 	(cd $(BINTMPDIR) && tar cf - .) | \
 	  gzip -c -9 > libguestfs-$(VERSION)-$(host_cpu).tar.gz