From d19ceb226c242844467b2935c1e19b989b4315e8 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones@redhat.com>
Date: Thu, 9 Apr 2009 19:47:22 +0100
Subject: [PATCH] Remove *~ files when doing 'make clean'.

---
 Makefile.am          | 2 +-
 daemon/Makefile.am   | 4 +++-
 examples/Makefile.am | 2 ++
 fish/Makefile.am     | 2 ++
 images/Makefile.am   | 2 ++
 ocaml/Makefile.am    | 2 ++
 perl/Makefile.am     | 2 ++
 python/Makefile.am   | 2 ++
 src/Makefile.am      | 4 +++-
 9 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f2cb9d9..55e5dde 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -146,7 +146,7 @@ test-boot-realistic: emptydisk
 
 # Make clean.
 
-CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp
+CLEANFILES = $(fs_DATA) emptydisk pod2htm?.tmp *~ html/*~
 
 clean-local:
 	rm -rf initramfs
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index bdeeacf..c5ae1ef 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -34,4 +34,6 @@ guestfsd_SOURCES = \
 	../src/guestfs_protocol.h \
 	../src/guestfs_protocol.c
 
-guestfsd_CFLAGS = -Wall
\ No newline at end of file
+guestfsd_CFLAGS = -Wall
+
+CLEANFILES = *~
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 9bac5f3..cafb7f9 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -9,3 +9,5 @@ df_LDADD = $(top_builddir)/src/libguestfs.la
 hello_SOURCES = hello.c
 hello_CFLAGS = -I$(top_builddir)/src -Wall
 hello_LDADD = $(top_builddir)/src/libguestfs.la
+
+CLEANFILES = *~
diff --git a/fish/Makefile.am b/fish/Makefile.am
index 76a2894..b9c51b8 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -25,3 +25,5 @@ guestfish_CFLAGS = \
 	-I$(top_builddir)/src -Wall \
 	-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"'
 guestfish_LDADD = $(top_builddir)/src/libguestfs.la
+
+CLEANFILES = *~
diff --git a/images/Makefile.am b/images/Makefile.am
index 99266ad..e9ea2f4 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -16,3 +16,5 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 EXTRA_DIST	= mbr-ext2-empty.img.gz
+
+CLEANFILES = *~
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 00e8027..ee42134 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -22,6 +22,8 @@ EXTRA_DIST = \
 
 SUBDIRS = examples
 
+CLEANFILES = *~
+
 if HAVE_OCAML
 
 noinst_DATA = mlguestfs.cma mlguestfs.cmxa META
diff --git a/perl/Makefile.am b/perl/Makefile.am
index 24548ed..c72d045 100644
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -25,6 +25,8 @@ EXTRA_DIST = \
 	examples/*.pl \
 	t/*.t
 
+CLEANFILES = *~ examples/*~ t/*~
+
 if HAVE_PERL
 
 # Interfacing automake and ExtUtils::MakeMaker known to be
diff --git a/python/Makefile.am b/python/Makefile.am
index e4ef9e8..509e87c 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -17,6 +17,8 @@
 
 EXTRA_DIST = README-python-bindings
 
+CLEANFILES = *~
+
 if HAVE_PYTHON
 
 endif
\ No newline at end of file
diff --git a/src/Makefile.am b/src/Makefile.am
index de02622..20b445c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,4 +47,6 @@ guestfs_protocol.h: guestfs_protocol.x
 	rm -f $@-t
 	$(RPCGEN) -h -o $@-t $<
 	mv $@-t $@
-endif
\ No newline at end of file
+endif
+
+CLEANFILES = *~
-- 
1.8.3.1