X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.am;h=a4f24be2f4b08d1e7d3f246fe207772fb419770e;hb=6d75ce8e6ca1f3f0a946ee4e214f6d2bff07adc4;hp=5b19c3084f5fd2fe6ca62f0b59e601b89d437818;hpb=37e632b7b8e1bd8c9893bb8e3c9a8691c78256a4;p=libguestfs.git

diff --git a/Makefile.am b/Makefile.am
index 5b19c30..a4f24be 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
@@ -91,7 +91,12 @@ EXTRA_DIST = \
 	contrib/README \
 	bindtests \
 	.gitignore \
-	m4/.gitignore
+	m4/.gitignore \
+	libtool-kill-dependency_libs.sh \
+	autogen.sh \
+	bugs-in-changelog.sh \
+	relink-static.sh \
+	update-bugs.sh
 
 # Recipes web page.
 html/recipes.html: $(wildcard recipes/*.sh) $(wildcard recipes/*.html) $(wildcard recipes/*.example) Makefile make-recipes.sh
@@ -177,14 +182,9 @@ pkgconfig_DATA = libguestfs.pc
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA) \
-	emptydisk \
+CLEANFILES = \
 	pod2htm?.tmp \
-	html/*.html \
-	guestfs.3 guestfish.1
-
-clean-local:
-	rm -rf initramfs
+	html/*.html
 
 # If you don't want to run all of the tests ('make check') then this
 # will just run libguestfs-test-tool for a quick check.  Note this
@@ -223,7 +223,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