[folks] contactlist: copy .deps to the same place as .vapi if necessary

[Simon McVittie <smcv src gnome org>]

commit 07747b757cb4a372f30d540143046765ceb2192c
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Wed Apr 3 18:49:23 2013 +0100

    contactlist: copy .deps to the same place as .vapi if necessary
    
    valac specifically expects to find them in the same place: it's not
    enough to have them both in the search path.
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=697188
    Signed-off-by: Simon McVittie <simon mcvittie collabora co uk>
    Reviewed-by: Philip Withnall <philip tecnocode co uk>

 tests/lib/telepathy/contactlist/Makefile.am |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/tests/lib/telepathy/contactlist/Makefile.am b/tests/lib/telepathy/contactlist/Makefile.am
index 4c81c07..1ddd7a3 100644
--- a/tests/lib/telepathy/contactlist/Makefile.am
+++ b/tests/lib/telepathy/contactlist/Makefile.am
@@ -72,7 +72,11 @@ tp_test_contactlist_gir_NAMESPACE = TpTests
 INTROSPECTION_GIRS += tp-test-contactlist.gir
 
 if HAVE_VALA
-tp-test-contactlist.vapi: tp-test-contactlist.gir
+# The .vapi is output in the $(builddir), and valac looks for .deps
+# in the same directory as the .vapi rather than going through the search
+# path again, so we need to copy the .deps to the $(builddir) too.
+tp-test-contactlist.vapi: tp-test-contactlist.gir tp-test-contactlist.deps
+       @test x$(srcdir) = x. || cp $(srcdir)/tp-test-contactlist.deps .
        $(MAKE) $(AM_MAKEFLAGS) tp-test-contactlist.gir
        $(AM_V_GEN)$(VAPIGEN) $(VAPIGENFLAGS) --library tp-test-contactlist \
                tp-test-contactlist.gir
@@ -111,5 +115,6 @@ EXTRA_DIST = \
 
 clean-local:
        rm -rf _gen
+       test x$(srcdir) = x. || rm -f tp-test-contactlist.deps
 
 -include $(top_srcdir)/git.mk