[PATCH 1/3] Remove test-coverage output files for "make clean".

[James Youngman]

* find/Makefile.am (CLEANFILES): Clean the .gcda and .gcdo files
which are produced by running programs that were compile with gcc
-fprofile-arcs -ftest-coverage.
* lib/Makefile.am (CLEANFILES): Likewise.
* locate/Makefile.am (CLEANFILES): Likewise.
* xargs/Makefile.am (CLEANFILES): Likewise.
---
 ChangeLog          |    8 ++++++++
 find/Makefile.am   |   12 +++++++++++-
 lib/Makefile.am    |    9 ++++++++-
 locate/Makefile.am |   12 +++++++++++-
 xargs/Makefile.am  |    2 ++
 5 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e6d9fef..39a7a5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-06-18  James Youngman  <address@hidden>
 
+       Remove test-coverage output files for "make clean".
+       * find/Makefile.am (CLEANFILES): Clean the .gcda and .gcdo files
+       which are produced by running programs that were compile with gcc
+       -fprofile-arcs -ftest-coverage.
+       * lib/Makefile.am (CLEANFILES): Likewise.
+       * locate/Makefile.am (CLEANFILES): Likewise.
+       * xargs/Makefile.am (CLEANFILES): Likewise.
+
        Move the printing code into print.c.
        * find/print.c (scan_for_digit_differences): Move to this file
        from pred.c.
diff --git a/find/Makefile.am b/find/Makefile.am
index 67fd682..acdfd26 100644
--- a/find/Makefile.am
+++ b/find/Makefile.am
@@ -6,7 +6,9 @@ localedir = $(datadir)/locale
 
 noinst_LIBRARIES = libfindtools.a
 libfindtools_a_SOURCES = finddata.c fstype.c parser.c pred.c exec.c tree.c 
util.c sharefile.c print.c
-
+libfindtools_coverage_files = \
+       $(libfindtools_a_SOURCES:.c=.gcno) \
+       $(libfindtools_a_SOURCES:.c=.gcda)
 
 # We always build two versions of find, one with fts, one without.
 # Their names depend on whether the user specified --with-fts.
@@ -19,11 +21,15 @@ if WITH_FTS
 bin_PROGRAMS     = find oldfind
 find_SOURCES     = ftsfind.c
 oldfind_SOURCES  = find.c
+find_coverage_files = $(oldfind_SOURCES:.c=.gcno) $(find_SOURCES:.c=.gcno) \
+                      $(oldfind_SOURCES:.c=.gcda) $(find_SOURCES:.c=.gcda)
 man_MANS         = find.1 oldfind.1
 else
 bin_PROGRAMS      = find ftsfind
 find_SOURCES      = find.c
 ftsfind_SOURCES   = ftsfind.c
+find_coverage_files = $(ftsfind_SOURCES:.c=.gcno) $(find_SOURCES:.c=.gcno) \
+                      $(ftsfind_SOURCES:.c=.gcda) $(find_SOURCES:.c=.gcda)
 man_MANS          = find.1 ftsfind.1
 endif
 
@@ -38,5 +44,9 @@ SUBDIRS = . testsuite
 
 dist-hook: findutils-check-manpages
 
+# Clean coverage files generated by running binaries built with
+# gcc -fprofile-arcs -ftest-coverage
+CLEANFILES = $(libfindtools_coverage_files) $(find_coverage_files)
+
 findutils-check-manpages:
        $(top_srcdir)/build-aux/man-lint.sh $(srcdir) $(man_MANS)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5450e9a..dbfb1a1 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -24,7 +24,6 @@ EXTRA_DIST = extendbuf.h savedirinfo.h buildcmd.h \
        fdleak.h unused-result.h check-regexprops.sh
 SUFFIXES =
 MOSTLYCLEANFILES =
-CLEANFILES = check-regexprops
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
 
@@ -38,6 +37,14 @@ libfind_a_SOURCES += listfile.c extendbuf.c buildcmd.c 
savedirinfo.c \
        forcefindlib.c qmark.c printquoted.c regextype.c dircallback.c fdleak.c 
\
        safe-atoi.c splitstring.c
 
+CLEANFILES = check-regexprops \
+       $(regexprops_SOURCES:.c=.gcno) \
+       $(regexprops_SOURCES:.c=.gcda) \
+       $(libfind_a_SOURCES:.c=.gcno) \
+       $(libfind_a_SOURCES:.c=.gcda) \
+       $(test_splitstring_SOURCES:.c=.gcno) \
+       $(test_splitstring_SOURCES:.c=.gcda)
+
 EXTRA_DIST += waitpid.c forcefindlib.c
 TESTS_ENVIRONMENT = REGEXPROPS=regexprops$(EXEEXT)
 libfind_a_LIBADD = $(FINDLIBOBJS)
diff --git a/locate/Makefile.am b/locate/Makefile.am
index 954a696..fd02fc8 100644
--- a/locate/Makefile.am
+++ b/locate/Makefile.am
@@ -14,7 +14,17 @@ bin_SCRIPTS = updatedb
 man_MANS = locate.1 updatedb.1 locatedb.5
 BUILT_SOURCES = dblocation.texi
 EXTRA_DIST = dblocation.texi locatedb.h updatedb.sh $(man_MANS)
-CLEANFILES = updatedb
+CLEANFILES = \
+       updatedb \
+       $(bigram_SOURCES:.c=.gcno) \
+       $(bigram_SOURCES:.c=.gcda) \
+       $(code_SOURCES:.c=.gcno) \
+       $(code_SOURCES:.c=.gcda) \
+       $(frcode_SOURCES:.c=.gcno) \
+       $(frcode_SOURCES:.c=.gcda) \
+       $(locate_SOURCES:.c=.gcno) \
+       $(locate_SOURCES:.c=.gcda)
+
 DISTCLEANFILES = dblocation.texi
 locate_SOURCES = locate.c word_io.c
 code_SOURCES = code.c word_io.c
diff --git a/xargs/Makefile.am b/xargs/Makefile.am
index 75d07b6..d34f87a 100644
--- a/xargs/Makefile.am
+++ b/xargs/Makefile.am
@@ -8,6 +8,8 @@ LDADD = ../lib/libfind.a ../gl/lib/libgnulib.a $(LIB_CLOSE) 
$(LIBINTL)
 EXTRA_DIST = $(man_MANS)
 SUBDIRS = . testsuite
 
+CLEANFILES = $(xargs_SOURCES:.c=.gcno) $(xargs_SOURCES:.c=.gcda)
+
 $(PROGRAMS): ../lib/libfind.a ../gl/lib/libgnulib.a
 
 dist-hook: findutils-check-manpages
-- 
1.7.2.5