From fd695fb5716751253c5cfb1586c4d1627092d9aa Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 14 Feb 2014 11:30:51 +0100 Subject: [PATCH] plugins/Makefile.am: copy libtool magic from Gabble Gabble uses these runs to build plugins which seems to fix a bug preventing the plugin to be properly linked with some symbols. Fix https://bugs.freedesktop.org/show_bug.cgi?id=74971 --- plugins/Makefile.am | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 5325b93..35a58eb 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,6 +1,6 @@ # testing-only plugins noinst_LTLIBRARIES = \ - test.la + libtest.la installable_plugins = $(NULL) @@ -13,15 +13,24 @@ else noinst_LTLIBRARIES += $(installable_plugins) endif -AM_LDFLAGS = -module -avoid-version -shared +AM_LDFLAGS = -avoid-version -shared -no-undefined -test_la_SOURCES = \ +ALL_PLUGIN_LIBS = \ + @WOCKY_LIBS@ \ + @GLIB_LIBS@ \ + @TELEPATHY_GLIB_LIBS@ \ + $(top_builddir)/extensions/libsalut-extensions.la \ + $(top_builddir)/src/libsalut-plugins.la + +libtest_la_LIBADD = $(ALL_PLUGIN_LIBS) + +libtest_la_SOURCES = \ test.c \ test.h -# because test.la is not installed, libtool will want to compile it as static +# because libtest.la is not installed, libtool will want to compile it as static # despite -shared (a convenience library), unless we also use -rpath -test_la_LDFLAGS = $(AM_LDFLAGS) -rpath $(pluginexecdir) +libtest_la_LDFLAGS = $(AM_LDFLAGS) -rpath $(pluginexecdir) AM_CFLAGS = $(ERROR_CFLAGS) \ -I $(top_srcdir) -I $(top_builddir) \ -- 1.8.5.3