From 66d6cb642c936916e4b1bfcaa48e6fb345f6daf5 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 11 Sep 2008 18:06:57 -0400
Subject: [PATCH] [Makefile.am.common] Unify more common rules

---
 boilerplate/Makefile.am  | 4 ----
 build/Makefile.am.common | 2 ++
 perf/Makefile.am         | 1 -
 src/Makefile.am          | 2 --
 test/Makefile.am         | 3 +--
 util/Makefile.am         | 2 +-
 6 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
index a31d7a9ea..a24a6d08f 100644
--- a/boilerplate/Makefile.am
+++ b/boilerplate/Makefile.am
@@ -96,9 +96,6 @@ AM_CPPFLAGS =					\
 	-I$(top_srcdir)/src			\
 	$(CAIRO_CFLAGS)
 
-CLEANFILES +=					\
-	$(EXTRA_LTLIBRARIES)
-
 test: check
 
 if CROSS_COMPILING
@@ -108,4 +105,3 @@ endif
 
 check_PROGRAMS += check-link
 check_link_LDADD = libcairoboilerplate.la
-CLEANFILES += check-link
diff --git a/build/Makefile.am.common b/build/Makefile.am.common
index fd0ec3dd1..bf5bde36a 100644
--- a/build/Makefile.am.common
+++ b/build/Makefile.am.common
@@ -9,4 +9,6 @@ TESTS =
 check_PROGRAMS =
 
 CLEANFILES += *.i *.s
+CLEANFILES += $(EXTRA_LTLIBRARIES) $(EXTRA_PROGRAMS) $(check_PROGRAMS)
+DISTCLEANFILES += $(BUILT_SOURCES)
 MAINTAINERCLEANFILES += Makefile.in
diff --git a/perf/Makefile.am b/perf/Makefile.am
index ebe39c961..0f48fb276 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -93,7 +93,6 @@ VALGRIND_MEMCHECK_FLAGS = \
 VALGRIND_CALLGRIND_FLAGS = \
 	--tool=callgrind
 CLEANFILES += \
-	$(EXTRA_PROGRAMS) \
 	valgrind-log \
 	callgrind.out.* \
 	index.html
diff --git a/src/Makefile.am b/src/Makefile.am
index 61ea4f8b9..4ea982fd7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,7 +39,6 @@ cairoinclude_HEADERS += $(top_srcdir)/cairo-version.h
 nodist_cairoinclude_HEADERS = cairo-features.h
 libcairo_la_SOURCES += cairo-version.h cairo-features.h
 BUILT_SOURCES  += cairo-features.h cairo-supported-features.h
-DISTCLEANFILES += cairo-features.h cairo-supported-features.h
 cairo-features.h cairo-supported-features.h:
 	cd $(top_builddir) && ./config.status src/$@
 
@@ -82,7 +81,6 @@ endif
 EXTRA_DIST += $(TESTS_SH) check-has-hidden-symbols.c
 check_PROGRAMS += check-link
 check_link_LDADD = libcairo.la
-CLEANFILES += check-link
 
 
 # The pre-processed result is used by check-{def,plt}.sh to determine whether
diff --git a/test/Makefile.am b/test/Makefile.am
index 1527d1497..1ebc14558 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -917,8 +917,7 @@ CLEANFILES +=					\
 	svg-surface-source.svg			\
 	pdf-surface-source.pdf			\
 	ps-surface-source.ps			\
-	$(EXTRA_LTLIBRARIES)			\
-	$(EXTRA_PROGRAMS)
+	$(NULL)
 
 # This used to be a simple 'echo ${RM} *.ps *.pdf *.svg *.etc', but
 # most systems cannot handle all of our clean files together.
diff --git a/util/Makefile.am b/util/Makefile.am
index f481a2121..bf6f19cd5 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -6,7 +6,7 @@ util: malloc-stats.so
 	$(RM) $@
 	$(LN_S) .libs/$*.so $@
 
-CLEANFILES += *.so *.la
+CLEANFILES += *.so
 
 SOLDFLAGS = -module -avoid-version -export-dynamic -rpath /dev/null