Consolidate the tp-vala valaflags into configure.ac

Rather than calling pkg-config from various Makefiles to find out the
same information.

diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am
index 901240b..1bcbc1c 100644 (file)
--- a/backends/telepathy/Makefile.am
+++ b/backends/telepathy/Makefile.am
@@ -4,8 +4,7 @@ AM_CPPFLAGS = \
        -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
        $(NULL)
 
-# this seems to work, even if vim's syntax highlighting suggests otherwise
-VALAFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --variable=valaflags telepathy-vala)
+VALAFLAGS += $(TP_VALA_VALAFLAGS)
 VALAFLAGS += --vapidir=. --vapidir=$(top_srcdir)/folks
 
 VALAFLAGS += \

diff --git a/configure.ac b/configure.ac
index d024ddc..6c11d0a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ AC_PATH_PROG(VALAC, valac, valac)
 AC_SUBST(VALAC)
 
 PKG_PROG_PKG_CONFIG([0.21])
-AC_SUBST(PKG_CONFIG_PATH)
 
 # require GLib >= 2.24 so GLib.Array, etc. reffing is handled automatically
 VALACFLAGS="$VALACFLAGS --target-glib=2.24"
@@ -88,6 +87,9 @@ PKG_CHECK_MODULES(TP_VALA, telepathy-vala >= $TP_VALA_REQUIRED)
 AC_SUBST(TP_VALA_CFLAGS)
 AC_SUBST(TP_VALA_LIBS)
 
+TP_VALA_VALAFLAGS=`$PKG_CONFIG --variable=valaflags telepathy-vala`
+AC_SUBST(TP_VALA_VALAFLAGS)
+
 PKG_CHECK_MODULES(TP_GLIB, telepathy-glib >= $TP_GLIB_REQUIRED)
 AC_SUBST(TP_GLIB_CFLAGS)
 AC_SUBST(TP_GLIB_LIBS)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 0e3a364..947c49a 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -24,7 +24,7 @@ img_DATA = \
 $(doc_data) $(innerdoc_DATA) $(img_DATA): folks-0.1/index.html
 
 VALAFLAGS = --vapidir=$(top_srcdir)/folks --vapidir=$(top_srcdir)/backends/telepathy
-VALAFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --variable=valaflags telepathy-vala)
+VALAFLAGS += $(TP_VALA_VALAFLAGS)
 
 # The Vala files which will have documentation extracted from them
 doc_files = $(top_srcdir)/folks/*.vala $(top_srcdir)/backends/telepathy/*.vala

diff --git a/folks/Makefile.am b/folks/Makefile.am
index bce2873..3352a59 100644 (file)
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -8,8 +8,7 @@ AM_CPPFLAGS = \
        -DBACKEND_DIR=\"$(backenddir)\" \
        $(NULL)
 
-# this seems to work, even if vim's syntax highlighting suggests otherwise
-VALAFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --variable=valaflags telepathy-vala)
+VALAFLAGS += $(TP_VALA_VALAFLAGS)
 VALAFLAGS += --vapidir=.
 VALAFLAGS += --pkg build-conf --pkg gobject-2.0 --pkg gio-2.0 --pkg gee-1.0 \
                --pkg gmodule-2.0 --pkg dbus-glib-1 --pkg telepathy-glib