[folks] Define the Telepathy BACKEND_NAME directly.

[Travis Reitter <treitter src gnome org>]

commit 14114584c54b145aefa0e892efd9c7f3fd63a8b0
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Tue Jan 11 16:30:56 2011 -0800

    Define the Telepathy BACKEND_NAME directly.
    
    Properly distributing the backend.mk file proved more difficult than it was
    worth (it was breaking 'make check' during distcheck), so we've reverted to
    direct definition.

 backends/telepathy/Makefile.am     |    3 ++-
 backends/telepathy/backend.mk      |    1 -
 backends/telepathy/lib/Makefile.am |   11 ++++++++---
 tests/folks/backend-loading.vala   |    1 +
 4 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am
index 0be83a6..78419ad 100644
--- a/backends/telepathy/Makefile.am
+++ b/backends/telepathy/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = lib
 
+BACKEND_NAME = "telepathy"
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/folks \
 	-I$(top_srcdir)/backends/telepathy/lib \
@@ -57,5 +59,4 @@ GITIGNOREFILES = \
 	libfolks_backend_telepathy_la_vala.stamp \
 	$(NULL)
 
--include backend.mk
 -include $(top_srcdir)/git.mk
diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
index 2d1f652..61720e8 100644
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@ -1,3 +1,5 @@
+BACKEND_NAME = "telepathy"
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/folks \
 	-include $(CONFIG_HEADER) \
@@ -84,6 +86,11 @@ pkgconfig_DATA = $(pkgconfig_in:.in=)
 
 libfolks_telepathy_la_vala.stamp: tp-lowlevel.vapi
 
+BUILT_SOURCES = \
+	tp-lowlevel.gir \
+	tp-lowlevel.vapi \
+	$(NULL)
+
 folks_telepathy_valasources = \
 	tpf-persona.vala \
 	tpf-persona-store.vala \
@@ -160,8 +167,7 @@ MAINTAINERCLEANFILES = \
 	libtp_lowlevel_la_vala.stamp \
 	folks-telepathy.h \
 	folks-telepathy.vapi \
-	tp-lowlevel.gir \
-	tp-lowlevel.vapi \
+	$(BUILT_SOURCES) \
 	$(NULL)
 
 EXTRA_DIST = \
@@ -175,5 +181,4 @@ EXTRA_DIST = \
 # a Vala library during distcheck otherwise
 noinst_HEADERS = $(tp_lowlevel_headers)
 
--include ../backend.mk
 -include $(top_srcdir)/git.mk
diff --git a/tests/folks/backend-loading.vala b/tests/folks/backend-loading.vala
index c86d36a..23a3f29 100644
--- a/tests/folks/backend-loading.vala
+++ b/tests/folks/backend-loading.vala
@@ -66,6 +66,7 @@ public class BackendLoadingTests : Folks.TestCase
               store.enabled_backends.foreach ((i) =>
                 {
                   var backend = (Backend) i;
+
                   assert (backends_expected.contains (backend.name));
                   backends_expected.remove (backend.name);
                 });