diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-20 17:51:47 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-27 09:20:49 +0000 |
| commit | eb9d0e1087f49abb608f771dca50753f2b19b668 (patch) | |
| tree | 199116992bfcb9cfd444d153027a62aeed8bd901 | |
| parent | f09076f660157d7b51870c9d018da635cd66a501 (diff) | |
don't try to use more than one -rpath for installed tests' plugins
| -rw-r--r-- | tests/twisted/Makefile.am | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am index c7044eb5..9d754f82 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) |