From 7e9a39480e0ffce38731497d7f73a10513419a42 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 21 Feb 2012 21:56:55 +0000 Subject: [PATCH] Make libgabble-plugins.la a libtool convenience library on non-Windows, non-Android This avoids putting an unversioned shared library in the public library directory, which is discouraged. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46417 --- src/Makefile.am | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 9ab4a15..fc514cc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -228,9 +228,18 @@ telepathy_gabble_LDFLAGS = -export-dynamic noinst_LTLIBRARIES = libgabble-convenience.la -lib_LTLIBRARIES = libgabble-plugins.la +lib_LTLIBRARIES = -libgabble_plugins_la_LDFLAGS = -shared -no-undefined -avoid-version +libgabble_plugins_la_LDFLAGS = -no-undefined + +if WINDOWS +lib_LTLIBRARIES += libgabble-plugins.la +libgabble_plugins_la_LDFLAGS += -shared -avoid-version +else +# When Wocky and the Gabble plugin API are both stable, this can move +# to $(libdir), with proper versioning. +noinst_LTLIBRARIES += libgabble-plugins.la +endif libgabble_plugins_la_LIBADD = \ $(ALL_LIBS) -- 1.7.9.1