[folks] build: Tidy up test Makefiles a little

[Philip Withnall <pwithnall src gnome org>]

commit 96c51fe585b90e4d8b5792b286cc0236433c20b4
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu Jan 3 10:35:03 2013 +0000

    build: Tidy up test Makefiles a little

 tests/Makefile.am      |   42 +++++++++++++++---------------------------
 tests/data/Makefile.am |    1 +
 2 files changed, 16 insertions(+), 27 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ae26f91..4dd9313 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,10 @@
 SUBDIRS = \
-    data \
-    lib \
-    tools \
-    folks \
-    $(NULL)
+	data \
+	key-file \
+	lib \
+	tools \
+	folks \
+	$(NULL)
 
 if ENABLE_TELEPATHY
 SUBDIRS += telepathy
@@ -17,8 +18,6 @@ if ENABLE_EDS
 SUBDIRS += eds
 endif
 
-SUBDIRS += key-file
-
 # XXX: keep Tracker at the end, since it's the most likely to fail (in ways we
 # can't easily control)
 if ENABLE_TRACKER
@@ -26,26 +25,15 @@ SUBDIRS += tracker
 endif
 
 DIST_SUBDIRS = \
-    data \
-    lib \
-    tools \
-    folks \
-    eds \
-    key-file \
-    telepathy \
-    libsocialweb \
-    tracker \
-    $(NULL)
-
-TESTS_ENVIRONMENT = \
-    abs_top_builddir= abs_top_builddir@ \
-    abs_top_srcdir= abs_top_srcdir@ \
-    G_SLICE=debug-blocks \
-    G_DEBUG=fatal_warnings,fatal_criticals \
-    PYTHONPATH= abs_top_srcdir@/tools
-
-EXTRA_DIST = \
-	$(srcdir)/data/avatar-01.jpg \
+	data \
+	lib \
+	tools \
+	folks \
+	eds \
+	key-file \
+	telepathy \
+	libsocialweb \
+	tracker \
 	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index a2b9838..c8884b4 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST = \
+	avatar-01.jpg \
 	backend-store-all.ini \
 	$(NULL)