Set correct module flags on libsecret

 * Pointed out by Robert Ancell

https://bugzilla.gnome.org/show_bug.cgi?id=680207

diff --git a/libsecret/Makefile.am b/libsecret/Makefile.am
index 46727d7..82c80d8 100644 (file)
--- a/libsecret/Makefile.am
+++ b/libsecret/Makefile.am
@@ -2,14 +2,6 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = . tests
 
-module_flags = \
-       -version-info $(SECRET_LT_RELEASE) \
-       -export_dynamic \
-       -avoid-version \
-       -module \
-       -no-undefined \
-       -export-symbols-regex '^secret_'
-
 INCLUDES = \
        -I$(top_srcdir) \
        -DSECRET_COMPILATION \
@@ -79,11 +71,22 @@ libsecret_@SECRET_MAJOR@_la_SOURCES = \
 libsecret_@SECRET_MAJOR@_la_CFLAGS = \
        $(LIBGCRYPT_CFLAGS)
 
+libsecret_@SECRET_MAJOR@_la_LDFLAGS = \
+       -version-info $(SECRET_LT_RELEASE) \
+       -no-undefined \
+       -export-symbols-regex '^secret_'
+
 libsecret_@SECRET_MAJOR@_la_LIBADD = \
        $(top_builddir)/egg/libegg.la \
        $(LIBGCRYPT_LIBS) \
        $(LIBS)
 
+noinst_LTLIBRARIES = libsecret-testable.la
+libsecret_testable_la_SOURCES =
+libsecret_testable_la_LIBADD = $(libsecret_@SECRET_MAJOR@_la_OBJECTS) \
+       $(libsecret_@SECRET_MAJOR@_la_LIBADD)
+libsecret_testable_la_DEPENDENCIES = $(libsecret_@SECRET_MAJOR@_la_OBJECTS)
+
 DBUS_XML_DEFINITIONS = \
        $(srcdir)/org.freedesktop.Secrets.xml
 

diff --git a/libsecret/tests/Makefile.am b/libsecret/tests/Makefile.am
index 2bdd314..aed83e0 100644 (file)
--- a/libsecret/tests/Makefile.am
+++ b/libsecret/tests/Makefile.am
@@ -25,13 +25,12 @@ libmock_service_la_LDFLAGS = \
        -rpath /force/shared
 
 libmock_service_la_LIBADD = \
-       $(top_builddir)/egg/libegg.la \
-       $(top_builddir)/libsecret/libsecret-@SECRET_MAJOR@.la \
+       $(top_builddir)/libsecret/libsecret-testable.la \
        $(LIBGCRYPT_LIBS)
 
 LDADD =  \
        $(top_builddir)/egg/libegg.la \
-       $(top_builddir)/libsecret/libsecret-@SECRET_MAJOR@.la \
+       $(top_builddir)/libsecret/libsecret-testable.la \
        libmock_service.la \
        $(NULL)