Bug 652463 — Tidy up CLEANFILES

Tidy up pkg-config and configure-generated files in CLEANFILES and
DISTCLEANFILES.

Closes: bgo#652463

9 files changed, 12 insertions, 32 deletions

diff --git a/NEWS b/NEWS
index 9cc6dd3..49dea83 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Overview of changes from libfolks 0.5.2 to libfolks 0.5.3
 Bugs fixed:
 * Bug 649925 — expose SocialWebClient.Contact in Swf.Persona
 * Bug 646244 — Incomplete logic to handle attribute updates in Folks.Individual
+* Bug 652463 — Tidy up CLEANFILES
 
 API changes:
 * Swf.Persona retains and exposes its libsocialweb Contact
diff --git a/backends/libsocialweb/lib/Makefile.am b/backends/libsocialweb/lib/Makefile.am
index 5b323f7..4805e67 100644
--- a/backends/libsocialweb/lib/Makefile.am
+++ b/backends/libsocialweb/lib/Makefile.am
@@ -16,8 +16,6 @@ VAPIGENFLAGS += \
 folks_libsocialwebdir = $(libdir)
 folks_libsocialweb_LTLIBRARIES = libfolks-libsocialweb.la
 
-CLEANFILES =
-
 ##################################################################
 # Support library
 ##################################################################
@@ -95,11 +93,6 @@ dist_vapi_DATA = \
 # General
 ##################################################################
 
-CLEANFILES += \
-	$(pkgconfig_in:.in=) \
-	folks-libsocialweb-uninstalled.pc \
-	$(NULL)
-
 MAINTAINERCLEANFILES = \
 	$(folks_libsocialweb_valasources:.vala=.c) \
 	libfolks_libsocialweb_la_vala.stamp \
diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
index ef3dc71..675e2c6 100644
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@ -56,7 +56,6 @@ INTROSPECTION_SCANNER_ARGS = \
 	$(NULL)
 
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-CLEANFILES =
 
 tp-lowlevel.gir: $(libtp_lowlevel_la_SOURCES) $(tp_lowlevel_headers) \
 	libtp-lowlevel.la
@@ -159,11 +158,6 @@ dist_vapi_DATA = \
 # General
 ##################################################################
 
-CLEANFILES += \
-	$(pkgconfig_in:.in=) \
-	folks-telepathy-uninstalled.pc \
-	$(NULL)
-
 MAINTAINERCLEANFILES = \
 	$(folks_telepathy_valasources:.vala=.c) \
 	libfolks_telepathy_la_vala.stamp \
diff --git a/backends/tracker/lib/Makefile.am b/backends/tracker/lib/Makefile.am
index 7ceaa3f..7a9a4f6 100644
--- a/backends/tracker/lib/Makefile.am
+++ b/backends/tracker/lib/Makefile.am
@@ -15,8 +15,6 @@ VAPIGENFLAGS += \
 folks_trackerdir = $(libdir)
 folks_tracker_LTLIBRARIES = libfolks-tracker.la
 
-CLEANFILES =
-
 ##################################################################
 # Support library
 ##################################################################
@@ -96,11 +94,6 @@ dist_vapi_DATA = \
 # General
 ##################################################################
 
-CLEANFILES += \
-	$(pkgconfig_in:.in=) \
-	folks-tracker-uninstalled.pc \
-	$(NULL)
-
 MAINTAINERCLEANFILES = \
 	$(folks_tracker_valasources:.vala=.c) \
 	libfolks_tracker_la_vala.stamp \
diff --git a/folks/Makefile.am b/folks/Makefile.am
index 25eddad..6c66c18 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -97,11 +97,6 @@ EXTRA_DIST = \
 	build-conf.vapi \
 	$(NULL)
 
-CLEANFILES = \
-	$(pkgconfig_DATA) \
-	folks-uninstalled.pc \
-	$(NULL)
-
 BUILT_SOURCES = \
 	folks.h \
 	folks.vapi \
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 64b491e..8a967a9 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -11,7 +11,7 @@ clean-local: clean-gconf
 
 check: clean-gconf
 
-CLEANFILES = \
+DISTCLEANFILES = \
 	gconf.path \
 	$(NULL)
 
diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 0b6296d..1e1c595 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -31,10 +31,6 @@ libfolks_test_la_VALAFLAGS = \
 	-H folks-test.h \
 	$(NULL)
 
-CLEANFILES = \
-	folks-test-uninstalled.pc \
-	$(NULL)
-
 MAINTAINERCLEANFILES = \
 	$(libfolks_test_la_SOURCES:.vala=.c) \
 	libfolks_test_la_vala.stamp \
diff --git a/tests/lib/libsocialweb/Makefile.am b/tests/lib/libsocialweb/Makefile.am
index 0d06d7c..31180d7 100644
--- a/tests/lib/libsocialweb/Makefile.am
+++ b/tests/lib/libsocialweb/Makefile.am
@@ -38,10 +38,14 @@ MAINTAINERCLEANFILES = \
 	libsocialweb-test.h \
 	$(NULL)
 
+DISTCLEANFILES = \
+	session.conf \
+	$(NULL)
+
 EXTRA_DIST = \
 	libsocialweb-test.vapi \
 	libsocialweb-test.h \
-	session.conf \
+	session.conf.in \
 	$(NULL)
 
 GITIGNOREFILES = \
diff --git a/tests/lib/telepathy/contactlist/Makefile.am b/tests/lib/telepathy/contactlist/Makefile.am
index 51f45a6..280787b 100644
--- a/tests/lib/telepathy/contactlist/Makefile.am
+++ b/tests/lib/telepathy/contactlist/Makefile.am
@@ -88,10 +88,14 @@ MAINTAINERCLEANFILES = \
 	tp-test-contactlist.vapi \
 	$(NULL)
 
+DISTCLEANFILES = \
+	session.conf \
+	$(NULL)
+
 EXTRA_DIST = \
 	$(MAINTAINERCLEANFILES) \
 	manager-file.py \
-	session.conf \
+	session.conf.in \
 	tp-test-contactlist.h \
 	$(NULL)