[folks] Use absolute paths for --vapidir

[Simon McVittie <smcv src gnome org>]

commit a08b1b2f41f34a94c98c35552753d47eee98fcf3
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Thu Feb 28 16:50:08 2013 +0000

    Use absolute paths for --vapidir
    
    In the rules currently generated by Automake, valac currently runs
    cd'd into the ${srcdir}. It seems unwise to rely on that, and the
    only thing that will work regardless of whether ${srcdir} is ".",
    relative or absolute is its "absolutized" version.
    
    Similarly, look in both the ${srcdir} and the ${builddir} for Vala
    bindings we generate: the ${srcdir} because that's where valac currently
    puts them, and the ${builddir} because that's where they ought to go
    in principle.
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=694883
    Signed-off-by: Simon McVittie <simon mcvittie collabora co uk>
    Reviewed-by: Philip Withnall <philip tecnocode co uk>

 backends/telepathy/Makefile.am     |    9 ++++++---
 backends/telepathy/lib/Makefile.am |   13 +++++++++----
 folks/Makefile.am                  |    6 ++++--
 tests/folks/Makefile.am            |   15 ++++++++++-----
 tests/telepathy/Makefile.am        |   15 ++++++++++-----
 5 files changed, 39 insertions(+), 19 deletions(-)
---
diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am
index 0faf26a..df3cc80 100644
--- a/backends/telepathy/Makefile.am
+++ b/backends/telepathy/Makefile.am
@@ -5,9 +5,12 @@ BACKEND_NAME = "telepathy"
 VALAFLAGS += \
        $(AM_VALAFLAGS) \
        $(ERROR_VALAFLAGS) \
-       --vapidir=. \
-       --vapidir=$(top_builddir)/backends/telepathy/lib \
-       --vapidir=$(top_srcdir)/folks \
+       --vapidir=$(abs_srcdir) \
+       --vapidir=$(abs_builddir) \
+       --vapidir=$(abs_top_srcdir)/backends/telepathy/lib \
+       --vapidir=$(abs_top_builddir)/backends/telepathy/lib \
+       --vapidir=$(abs_top_srcdir)/folks \
+       --vapidir=$(abs_top_builddir)/folks \
        $(addprefix --pkg ,$(telepathy_deps)) \
        $(NULL)
 
diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
index 34f3187..02de1b7 100644
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@ -10,8 +10,11 @@ AM_CPPFLAGS = \
        $(NULL)
 
 VAPIGENFLAGS += \
-       --vapidir=. \
-       --vapidir=$(top_srcdir)/folks
+       --vapidir=$(abs_builddir) \
+       --vapidir=$(abs_srcdir) \
+       --vapidir=$(abs_top_builddir)/folks \
+       --vapidir=$(abs_top_srcdir)/folks \
+       $(NULL)
 
 noinst_LTLIBRARIES = libtp-lowlevel.la
 folks_telepathydir = $(libdir)
@@ -119,8 +122,10 @@ libfolks_telepathy_la_VALAFLAGS = \
        $(AM_VALAFLAGS) \
        $(ERROR_VALAFLAGS) \
        $(ZEITGEIST_VALAFLAGS) \
-       --vapidir=. \
-       --vapidir=$(top_srcdir)/folks \
+       --vapidir=$(abs_srcdir) \
+       --vapidir=$(abs_builddir) \
+       --vapidir=$(abs_top_srcdir)/folks \
+       --vapidir=$(abs_top_builddir)/folks \
        --pkg folks \
        --pkg folks-internal \
        --pkg tp-lowlevel \
diff --git a/folks/Makefile.am b/folks/Makefile.am
index 0e3da46..be47f57 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -22,7 +22,8 @@ libfolks_internal_la_VALAFLAGS = \
        $(AM_VALAFLAGS) \
        $(ERROR_VALAFLAGS) \
        --library=folks-internal \
-       --vapidir=. \
+       --vapidir=$(abs_srcdir) \
+       --vapidir=$(abs_builddir) \
        --pkg gobject-2.0 \
        --pkg gio-2.0 \
        --pkg gee-0.8 \
@@ -103,7 +104,8 @@ libfolks_la_VALAFLAGS = \
        $(ERROR_VALAFLAGS) \
        --gir=Folks-$(API_VERSION).gir \
        --library=folks \
-       --vapidir=. \
+       --vapidir=$(abs_srcdir) \
+       --vapidir=$(abs_builddir) \
        --pkg build-conf \
        --pkg folks-internal \
        --pkg gobject-2.0 \
diff --git a/tests/folks/Makefile.am b/tests/folks/Makefile.am
index 4239e28..78f862a 100644
--- a/tests/folks/Makefile.am
+++ b/tests/folks/Makefile.am
@@ -28,11 +28,16 @@ RUN_WITH_PRIVATE_BUS = $(top_srcdir)/tests/tools/with-session-bus.sh
 AM_VALAFLAGS = \
        $(ERROR_VALAFLAGS) \
        --disable-warnings \
-       --vapidir=. \
-       --vapidir=$(top_srcdir)/folks \
-       --vapidir=$(top_srcdir)/tests/lib \
-       --vapidir=$(top_srcdir)/tests/lib/key-file \
-       --vapidir=$(top_builddir)/tests/lib/telepathy/contactlist/ \
+       --vapidir=$(abs_srcdir) \
+       --vapidir=$(abs_builddir) \
+       --vapidir=$(abs_top_srcdir)/folks \
+       --vapidir=$(abs_top_builddir)/folks \
+       --vapidir=$(abs_top_srcdir)/tests/lib \
+       --vapidir=$(abs_top_builddir)/tests/lib \
+       --vapidir=$(abs_top_srcdir)/tests/lib/key-file \
+       --vapidir=$(abs_top_builddir)/tests/lib/key-file \
+       --vapidir=$(abs_top_srcdir)/tests/lib/telepathy/contactlist/ \
+       --vapidir=$(abs_top_builddir)/tests/lib/telepathy/contactlist/ \
        --pkg gobject-2.0 \
        --pkg gio-2.0 \
        --pkg gee-0.8 \
diff --git a/tests/telepathy/Makefile.am b/tests/telepathy/Makefile.am
index eb5a7a1..fce8e0a 100644
--- a/tests/telepathy/Makefile.am
+++ b/tests/telepathy/Makefile.am
@@ -28,11 +28,16 @@ RUN_WITH_PRIVATE_BUS = $(top_srcdir)/tests/tools/with-session-bus.sh
 
 AM_VALAFLAGS = \
        $(ERROR_VALAFLAGS) \
-       --vapidir=$(top_builddir)/tests/lib/telepathy/contactlist/ \
-       --vapidir=$(top_builddir)/tests/lib/ \
-       --vapidir=. \
-       --vapidir=$(top_srcdir)/folks \
-       --vapidir=$(top_srcdir)/backends/telepathy/lib \
+       --vapidir=$(abs_top_srcdir)/tests/lib/telepathy/contactlist/ \
+       --vapidir=$(abs_top_builddir)/tests/lib/telepathy/contactlist/ \
+       --vapidir=$(abs_top_srcdir)/tests/lib/ \
+       --vapidir=$(abs_top_builddir)/tests/lib/ \
+       --vapidir=$(abs_srcdir) \
+       --vapidir=$(abs_builddir) \
+       --vapidir=$(abs_top_srcdir)/folks \
+       --vapidir=$(abs_top_builddir)/folks \
+       --vapidir=$(abs_top_srcdir)/backends/telepathy/lib \
+       --vapidir=$(abs_top_builddir)/backends/telepathy/lib \
        --pkg gobject-2.0 \
        --pkg gio-2.0 \
        --pkg gee-0.8 \