[folks] Don't use BUILT_SOURCES in makefiles

[Philip Withnall <pwithnall src gnome org>]

commit 870ffaab3cb41d34e7694b1eba27992c44df89f3
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Thu Aug 26 14:23:33 2010 +0100

    Don't use BUILT_SOURCES in makefiles
    
    It messes around with the order of building things, which can cause problems
    when building subdirectories which are dependencies of the current directory.
    
    We didn't actually need it anyway, since all the files mentioned in
    BUILT_SOURCES were pulled in as dependencies of other build targets.

 backends/key-file/Makefile.am  |   12 ++++--------
 backends/telepathy/Makefile.am |   28 +++++++++++++---------------
 folks/Makefile.am              |   16 ++++++----------
 3 files changed, 23 insertions(+), 33 deletions(-)
---
diff --git a/backends/key-file/Makefile.am b/backends/key-file/Makefile.am
index 7021c38..13bad62 100644
--- a/backends/key-file/Makefile.am
+++ b/backends/key-file/Makefile.am
@@ -53,13 +53,6 @@ folks-backend-key-file.vapi folks-backend-key-file.vala.stamp: $(folks_backend_k
 		$(addprefix $(srcdir)/,$(folks_backend_key_file_valasources))
 	touch $@
 
-BUILT_SOURCES = \
-	folks-backend-key-file.h \
-	folks-backend-key-file.vala.stamp \
-	folks-backend-key-file.vapi \
-	$(libfolks_backend_key_file_la_SOURCES) \
-	$(NULL)
-
 EXTRA_DIST = \
 	$(folks_backend_key_file_valasources) \
 	folks-backend-key-file.vala.stamp \
@@ -67,7 +60,10 @@ EXTRA_DIST = \
 	$(NULL)
 
 CLEANFILES = \
-	$(BUILT_SOURCES) \
+	folks-backend-key-file.h \
+	folks-backend-key-file.vala.stamp \
+	folks-backend-key-file.vapi \
+	$(libfolks_backend_key_file_la_SOURCES) \
 	$(NULL)
 
 MAINTAINERCLEANFILES = \
diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am
index ab6eebf..09cadcc 100644
--- a/backends/telepathy/Makefile.am
+++ b/backends/telepathy/Makefile.am
@@ -207,33 +207,31 @@ folks-backend-telepathy.vapi folks-backend-telepathy.vala.stamp: $(vapi_deps)
 # General
 ##################################################################
 
-BUILT_SOURCES = \
-	folks-telepathy.h \
+EXTRA_DIST = \
+	$(folks_telepathy_valasources) \
+	$(folks_backend_telepathy_valasources) \
+	$(libtp_lowlevel_la_SOURCES) \
+	$(pkgconfig_in) \
 	folks-telepathy.vala.stamp \
 	folks-telepathy.vapi \
-	folks-backend-telepathy.h \
 	folks-backend-telepathy.vala.stamp \
 	folks-backend-telepathy.vapi \
-	tp-lowlevel.gir \
 	tp-lowlevel.vapi \
-	$(folks_telepathy_valasources:.vala=.c) \
-	$(libfolks_backend_telepathy_la_SOURCES) \
-	$(pkgconfig_in:.in=) \
-	folks-telepathy-uninstalled.pc \
 	$(NULL)
 
-CLEANFILES += $(BUILT_SOURCES)
-
-EXTRA_DIST = \
-	$(folks_telepathy_valasources) \
-	$(folks_backend_telepathy_valasources) \
-	$(libtp_lowlevel_la_SOURCES) \
-	$(pkgconfig_in) \
+CLEANFILES += \
+	folks-telepathy.h \
 	folks-telepathy.vala.stamp \
 	folks-telepathy.vapi \
+	folks-backend-telepathy.h \
 	folks-backend-telepathy.vala.stamp \
 	folks-backend-telepathy.vapi \
+	tp-lowlevel.gir \
 	tp-lowlevel.vapi \
+	$(folks_telepathy_valasources:.vala=.c) \
+	$(libfolks_backend_telepathy_la_SOURCES) \
+	$(pkgconfig_in:.in=) \
+	folks-telepathy-uninstalled.pc \
 	$(NULL)
 
 DISTCLEANFILES = \
diff --git a/folks/Makefile.am b/folks/Makefile.am
index d0cd276..0515e33 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -71,15 +71,6 @@ pkgconfig_in = folks.pc.in
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_in:.in=)
 
-BUILT_SOURCES = \
-	folks.h \
-	$(libfolks_la_SOURCES) \
-	folks.vapi \
-	folks.vala.stamp \
-	$(pkgconfig_DATA) \
-	folks-uninstalled.pc \
-	$(NULL)
-
 EXTRA_DIST = \
 	$(folks_valasources) \
 	$(pkgconfig_in) \
@@ -89,7 +80,12 @@ EXTRA_DIST = \
 	$(NULL)
 
 CLEANFILES = \
-	$(BUILT_SOURCES) \
+	folks.h \
+	$(libfolks_la_SOURCES) \
+	folks.vapi \
+	folks.vala.stamp \
+	$(pkgconfig_DATA) \
+	folks-uninstalled.pc \
 	$(NULL)
 
 MAINTAINERCLEANFILES = \