[gnome-builder] build: more Template-1.0 tweaks

[Christian Hergert <chergert src gnome org>]

commit 08a96e244d3ae21a594f2f62696694dccd353b0e
Author: Christian Hergert <chergert redhat com>
Date:   Tue Jan 26 19:51:33 2016 +0100

    build: more Template-1.0 tweaks

 libide/Makefile.am |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/libide/Makefile.am b/libide/Makefile.am
index e436520..657d914 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -537,7 +537,9 @@ if HAVE_INTROSPECTION
 
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+INTROSPECTION_COMPILER_ARGS = \
+       --includedir=$(srcdir) \
+       --includedir=$(top_builddir)/contrib/tmpl
 
 introspection_sources = \
        $(libide_1_0_la_public_sources) \
@@ -574,11 +576,12 @@ if ENABLE_VAPIGEN
 libide-1.0.vapi: Ide-1.0.gir
 
 VAPIGEN_VAPIS = libide-1.0.vapi
-VAPIGEN_VAPIDIRS = $(top_builddir)/contrib/tmpl
 
 libide_1_0_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-3.0 libpeas-1.0 template-glib-1.0
 libide_1_0_vapi_METADATADIRS = $(srcdir)
 libide_1_0_vapi_FILES = Ide-1.0.gir
+libide_1_0_vapi_VAPIDIRS = $(top_builddir)/contrib/tmpl
+libide_1_0_vapi_GIRDIRS = $(top_builddir)/contrib/tmpl
 
 libide-1.0.deps: Makefile
        $(AM_V_GEN) echo $(libide_1_0_vapi_DEPS) | tr ' ' '\n' > $@