[Pkg-telepathy-commits] [telepathy-mission-control-6] 06/90: don't try to use more than one -rpath for installed tests' plugins

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit eb9d0e1087f49abb608f771dca50753f2b19b668
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Mar 20 17:51:47 2014 +0000

    don't try to use more than one -rpath for installed tests' plugins
---
 tests/twisted/Makefile.am | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index c7044eb..9d754f8 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -186,6 +186,8 @@ plugins_list = \
 	libgiofakenetworkmonitor.la \
 	$(NULL)
 
+plugin_ldflags = -module -shared -avoid-version
+
 if ENABLE_INSTALLED_TESTS
 
 noinst_LTLIBRARIES = \
@@ -200,6 +202,11 @@ else
 # A demo dispatcher plugin (new, minimal API)
 noinst_LTLIBRARIES = $(plugins_list)
 
+# this rune is necessary to make libtool build a dlopen()able shared
+# library even though it's not going to be installed - the default for noinst
+# libraries is static
+plugin_ldflags += -rpath @abs_builddir@
+
 endif
 
 mcp_plugin_la_SOURCES = \
@@ -207,18 +214,15 @@ mcp_plugin_la_SOURCES = \
 	dbus-account-plugin.h \
 	mcp-plugin.c \
 	$(NULL)
-# these runes are necessary to make libtool build a dlopen()able shared
-# library even though it's not going to be installed - the default for noinst
-# libraries is static
-mcp_plugin_la_LDFLAGS = -module -shared -avoid-version -rpath @abs_builddir@
+mcp_plugin_la_LDFLAGS = $(plugin_ldflags)
 
 libgiofakenetworkmonitor_la_SOURCES = \
 	fake-network-monitor.c \
 	$(NULL)
-libgiofakenetworkmonitor_la_LDFLAGS = $(mcp_plugin_la_LDFLAGS)
+libgiofakenetworkmonitor_la_LDFLAGS = $(plugin_ldflags)
 
 mcp_account_diversion_la_SOURCES = mcp-account-diversion.c
-mcp_account_diversion_la_LDFLAGS = $(mcp_plugin_la_LDFLAGS)
+mcp_account_diversion_la_LDFLAGS = $(plugin_ldflags)
 
 # A debug version of the normal MC executable, which exits cleanly on
 # disconnection from D-Bus (so gcov info gets written out)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git