-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 += \
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"
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)
$(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
-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