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-20 17:51:47 +0000 |
| commit | 0731d9e7ba83a8322a6b165dd4ac36a24604311d (patch) | |
| tree | 5a770e3a066bd3fad436813f5fbb37cd18f711a5 | |
| parent | 7daec956255cfd6ab64ccb851c429e457e4e1f26 (diff) | |
don't try to use more than one -rpath for installed tests' pluginstests
| -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 ec392450..9e0f72c1 100644 --- a/tests/twisted/Makefile.am +++ b/tests/twisted/Makefile.am @@ -187,6 +187,8 @@ plugins_list = \ libgiofakenetworkmonitor.la \ $(NULL) +plugin_ldflags = -module -shared -avoid-version + if ENABLE_INSTALLED_TESTS noinst_LTLIBRARIES = \ @@ -201,6 +203,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 = \ @@ -208,18 +215,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) |