build: Fix test library build

Apparently my build environment *wasn’t* clean when I tested the stuff I
pushed at the weekend, even though I definitely cleaned it a few times.
Aaargh.

https://bugzilla.gnome.org/show_bug.cgi?id=724591

9 files changed, 11 insertions, 2 deletions

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index a6e958f0..2442d405 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -50,6 +50,7 @@ libfolks_test_la_SOURCES = \
 	haze-remove-directory.c \
 	gtestdbus.c \
 	gtestdbus.h \
+	folks-test-dbus.vapi \
 	test-case.vala \
 	test-case-helper.c \
 	test-utils.vala \
@@ -98,7 +99,6 @@ libfolks_test_la_VALAFLAGS = \
 	--pkg dbus-glib-1 \
 	--pkg folks \
 	--pkg build-conf \
-	--pkg folks-test-dbus \
 	--library folks-test \
 	--vapi folks-test.vapi \
 	-H folks-test.h \
diff --git a/tests/lib/dummy/Makefile.am b/tests/lib/dummy/Makefile.am
index 11610043..71c4ec80 100644
--- a/tests/lib/dummy/Makefile.am
+++ b/tests/lib/dummy/Makefile.am
@@ -18,6 +18,7 @@ libdummy_test_la_VALAFLAGS = \
 	--pkg folks \
 	--pkg folks-dummy \
 	--pkg folks-test \
+	--pkg folks-test-dbus \
 	-g \
 	$(NULL)
 
diff --git a/tests/lib/eds/Makefile.am b/tests/lib/eds/Makefile.am
index dddb57f0..ce83750b 100644
--- a/tests/lib/eds/Makefile.am
+++ b/tests/lib/eds/Makefile.am
@@ -22,6 +22,7 @@ libeds_test_la_VALAFLAGS = \
 	--pkg libxml-2.0 \
 	--pkg folks-eds \
 	--pkg folks-test \
+	--pkg folks-test-dbus \
 	-g \
 	$(NULL)
 
diff --git a/tests/lib/folks-test-dbus.vapi b/tests/lib/folks-test-dbus.vapi
index 59989f06..bc005ebb 100644
--- a/tests/lib/folks-test-dbus.vapi
+++ b/tests/lib/folks-test-dbus.vapi
@@ -28,7 +28,9 @@ namespace Folks
   [CCode (cheader_filename = "gtestdbus.h", cprefix = "FOLKS_TEST_DBUS_")]
   [Flags]
   public enum TestDBusFlags {
-    NONE
+    NONE,
+    SESSION_BUS,
+    SYSTEM_BUS
   }
 
   [CCode (cheader_filename = "gtestdbus.h")]
diff --git a/tests/lib/key-file/Makefile.am b/tests/lib/key-file/Makefile.am
index ebb067ba..a909d78a 100644
--- a/tests/lib/key-file/Makefile.am
+++ b/tests/lib/key-file/Makefile.am
@@ -14,6 +14,7 @@ libkf_test_la_VALAFLAGS = \
 	--vapidir=$(abs_top_srcdir)/tests/lib \
 	--vapidir=$(abs_top_builddir)/tests/lib \
 	--pkg folks-test \
+	--pkg folks-test-dbus \
 	-g \
 	$(NULL)
 
diff --git a/tests/lib/libsocialweb/Makefile.am b/tests/lib/libsocialweb/Makefile.am
index f186fe54..252813d7 100644
--- a/tests/lib/libsocialweb/Makefile.am
+++ b/tests/lib/libsocialweb/Makefile.am
@@ -19,6 +19,7 @@ libsocialweb_test_la_VALAFLAGS = \
 	--pkg libsocialweb-client \
 	--pkg folks-libsocialweb \
 	--pkg folks-test \
+	--pkg folks-test-dbus \
 	-g \
 	$(NULL)
 
diff --git a/tests/lib/telepathy/Makefile.am b/tests/lib/telepathy/Makefile.am
index be716c0e..648249e2 100644
--- a/tests/lib/telepathy/Makefile.am
+++ b/tests/lib/telepathy/Makefile.am
@@ -23,6 +23,7 @@ libtpf_test_la_VALAFLAGS = \
 	--vapidir=$(abs_top_builddir)/tests/lib/key-file \
 	--pkg build-conf \
 	--pkg folks-test \
+	--pkg folks-test-dbus \
 	--pkg kf-test \
 	--pkg tp-test-contactlist \
 	-g \
diff --git a/tests/lib/tracker/Makefile.am b/tests/lib/tracker/Makefile.am
index 02a4c5a5..639efb2e 100644
--- a/tests/lib/tracker/Makefile.am
+++ b/tests/lib/tracker/Makefile.am
@@ -19,6 +19,7 @@ libtracker_test_la_VALAFLAGS = \
 	--pkg tracker-sparql-$(TRACKER_SPARQL_MAJOR) \
 	--pkg folks-tracker \
 	--pkg folks-test \
+	--pkg folks-test-dbus \
 	-g \
 	$(NULL)
 
diff --git a/tests/test.mk b/tests/test.mk
index 0e0eb6bb..801d17ba 100644
--- a/tests/test.mk
+++ b/tests/test.mk
@@ -31,6 +31,7 @@ test_valaflags = \
 	--vapidir=$(top_builddir)/backends/dummy/lib \
 	--pkg folks \
 	--pkg folks-test \
+	--pkg folks-test-dbus \
 	--pkg folks-dummy \
 	--pkg gee-0.8 \
 	--pkg gio-2.0 \