[folks] Fix builddir != srcdir issue

[Philip Withnall <pwithnall src gnome org>]

commit 60b0255fc6628510cef674b12f29b84abf6163e6
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Thu Jun 5 15:44:12 2014 -0400

    Fix builddir != srcdir issue
    
    https://bugzilla.gnome.org/show_bug.cgi?id=731325

 NEWS                               |    1 +
 backends/backend-library.mk        |    6 +++++-
 backends/telepathy/lib/Makefile.am |    3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 2e54ffb..3f4d97d 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,7 @@ Bugs fixed:
  • Bug 705742 — Implement rate limiting in AvatarCache.store_avatar()
  • Bug 727944 — crash during Empathy startup: segfault in g_date_time_to_utc
    from _edsf_persona_update
+ • Bug 731325 — Fails to build with srcdir != builddir
 
 API changes:
  • Add Individual.display_name
diff --git a/backends/backend-library.mk b/backends/backend-library.mk
index 2994fae..2f54a5e 100644
--- a/backends/backend-library.mk
+++ b/backends/backend-library.mk
@@ -139,7 +139,7 @@ backend_library_ldflags = \
 #
 # This file sets namespace and version attributes for GIR.
 namespace.vala:
-       $(AM_V_GEN)echo -e "[CCode (gir_namespace = \"Folks$(BACKEND_NAME_C)\", gir_version = 
\"$(BACKEND_API_VERSION)\")]\nnamespace $(BACKEND_NAMESPACE) {}" > $@
+       $(AM_V_GEN)echo -e "[CCode (gir_namespace = \"Folks$(BACKEND_NAME_C)\", gir_version = 
\"$(BACKEND_API_VERSION)\")]\nnamespace $(BACKEND_NAMESPACE) {}" > $(srcdir)/$@
 
 MAINTAINERCLEANFILES += namespace.vala
 
@@ -166,6 +166,8 @@ EXTRA_DIST += $(pkgconfig_in)
 INTROSPECTION_SCANNER_ARGS = \
        $(ERROR_INTROSPECTION_SCANNER_ARGS) \
        --add-include-path=$(srcdir) \
+       --add-include-path=$(builddir) \
+       --add-include-path=$(abs_top_srcdir)/folks \
        --add-include-path=$(abs_top_builddir)/folks \
        --warn-all \
        $(NULL)
@@ -176,6 +178,8 @@ INTROSPECTION_SCANNER_ENV = \
 
 INTROSPECTION_COMPILER_ARGS = \
        --includedir=$(srcdir) \
+       --includedir=$(builddir) \
+       --includedir=$(abs_top_srcdir)/folks \
        --includedir=$(abs_top_builddir)/folks \
        $(NULL)
 
diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
index edc6a98..8e1e462 100644
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@ -158,7 +158,7 @@ FOLKS_TP_VALA_DEPS += tp-zeitgeist.vapi
 else
 FOLKS_TP_VALA_DEPS += tp-zeitgeist-dummy.vapi
 endif
-$(builddir)/libfolks_telepathy_la_vala.stamp: $(FOLKS_TP_VALA_DEPS)
+$(srcdir)/libfolks_telepathy_la_vala.stamp: $(FOLKS_TP_VALA_DEPS)
 
 libfolks_telepathy_la_SOURCES = \
        $(backend_library_sources) \
@@ -171,6 +171,7 @@ libfolks_telepathy_la_SOURCES = \
 
 libfolks_telepathy_la_VALAFLAGS = \
        $(backend_library_valaflags) \
+       --vapidir=$(abs_builddir) \
        --pkg tp-lowlevel \
        --pkg telepathy-glib \
        $(NULL)