[folks] build: Don't use make functions for defining TESTS

[Philip Withnall <pwithnall src gnome org>]

commit 5ffdeac6899925871da0d32aa5643fed5c2cb954
Author: Nuno Araujo <nuno araujo russo79 com>
Date:   Mon Jan 21 13:00:41 2013 +0100

    build: Don't use make functions for defining TESTS
    
    Usage of 'make' functions in the definition of TESTS special variable
    can lead to the creation of a corrupt Makefile.in, thus a corrupt Makefile.
    
    Closes: https://bugzilla.gnome.org/show_bug.cgi?id=692122

 NEWS                        |    1 +
 tests/telepathy/Makefile.am |   22 ++++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/NEWS b/NEWS
index 5811dbb..7193d6b 100644
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,7 @@ Bugs fixed:
 â Bug 686695 â support nickname in add_persona_from_details
 â Bug 691382 â Restore tests disabled by bug #668415 (which has been fixed)
 â Bug 691923 â Don't rebuild docs on every "make" run
+â Bug 692122 â build: Don't use make functions for defining TESTS
 
 API changes:
 â Add Backend.enable_persona_store and disable_persona_store.
diff --git a/tests/telepathy/Makefile.am b/tests/telepathy/Makefile.am
index 5058bd4..1ee7beb 100644
--- a/tests/telepathy/Makefile.am
+++ b/tests/telepathy/Makefile.am
@@ -44,15 +44,6 @@ AM_VALAFLAGS = \
 	-g \
 	$(NULL)
 
-noinst_PROGRAMS = \
-	fake-tp-backend \
-	persona-store-capabilities \
-	individual-retrieval \
-	individual-properties \
-	individual-zeitgeist \
-	init \
-	$(NULL)
-
 SESSION_CONF = $(top_builddir)/tests/lib/telepathy/contactlist/session.conf
 backend_store_key_file=$(srcdir)/data/backend-store-telepathy-only.ini
 TESTS_ENVIRONMENT = \
@@ -63,7 +54,18 @@ TESTS_ENVIRONMENT = \
 	$(RUN_WITH_PRIVATE_BUS) \
 	--config-file=$(SESSION_CONF) \
 	--
-TESTS = $(filter-out fake-tp-backend individual-zeitgeist,$(noinst_PROGRAMS))
+TESTS = \
+	persona-store-capabilities \
+	individual-retrieval \
+	individual-properties \
+	init \
+	$(NULL)
+
+noinst_PROGRAMS = \
+	fake-tp-backend \
+	individual-zeitgeist \
+	$(TESTS) \
+	$(NULL)
 
 fake_tp_backend_SOURCES = \
 	fake-tp-backend.vala \