dovecot-2.2: Link all libstorage.la dependencies into the librar...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/3ac5933082c4
changeset: 18247:3ac5933082c4
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Feb 13 16:38:35 2015 +0200
description:
Link all libstorage.la dependencies into the library itself instead.
Instead of keeping a lot of different libraries in LIBDOVECOT_STORAGE, which
have circular dependencies and may cause linking issues.

diffstat:

 configure.ac                |   9 +++++----
 src/lib-storage/Makefile.am |  15 +++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diffs (77 lines):

diff -r 16c21c12e21f -r 3ac5933082c4 configure.ac
--- a/configure.ac	Fri Feb 13 14:35:54 2015 +0200
+++ b/configure.ac	Fri Feb 13 16:38:35 2015 +0200
@@ -2551,14 +2551,15 @@
 else
   LIBDOVECOT_DEPS='$(top_builddir)/src/lib-master/libmaster.la $(top_builddir)/src/lib-settings/libsettings.la $(top_builddir)/src/lib-http/libhttp.la $(top_builddir)/src/lib-dict/libdict.la $(top_builddir)/src/lib-dns/libdns.la $(top_builddir)/src/lib-fs/libfs.la $(top_builddir)/src/lib-imap/libimap.la $(top_builddir)/src/lib-mail/libmail.la $(top_builddir)/src/lib-sasl/libsasl.la $(top_builddir)/src/lib-auth/libauth.la $(top_builddir)/src/lib-charset/libcharset.la $(top_builddir)/src/lib-ssl-iostream/libssl_iostream.la $(top_builddir)/src/lib-test/libtest.la $(top_builddir)/src/lib/liblib.la'
   LIBDOVECOT="$LIBDOVECOT_DEPS \$(LIBICONV) \$(MODULE_LIBS)"
-  LIBDOVECOT_STORAGE_LAST='$(top_builddir)/src/lib-storage/list/libstorage_list.la $(top_builddir)/src/lib-storage/index/libstorage_index.la $(top_builddir)/src/lib-storage/libstorage.la $(top_builddir)/src/lib-index/libindex.la $(top_builddir)/src/lib-imap-storage/libimap-storage.la'
-  LIBDOVECOT_STORAGE_FIRST='$(top_builddir)/src/lib-storage/libstorage_service.la $(top_builddir)/src/lib-storage/register/libstorage_register.la'
-  LIBDOVECOT_STORAGE_DEPS="$LIBDOVECOT_STORAGE_FIRST $LINKED_STORAGE_LIBS $LIBDOVECOT_STORAGE_LAST"
+  #LIBDOVECOT_STORAGE_LAST='$(top_builddir)/src/lib-storage/list/libstorage_list.la $(top_builddir)/src/lib-storage/index/libstorage_index.la $(top_builddir)/src/lib-storage/libstorage.la $(top_builddir)/src/lib-index/libindex.la $(top_builddir)/src/lib-imap-storage/libimap-storage.la'
+  #LIBDOVECOT_STORAGE_FIRST='$(top_builddir)/src/lib-storage/register/libstorage_register.la'
+  #LIBDOVECOT_STORAGE_DEPS="$LIBDOVECOT_STORAGE_FIRST $LINKED_STORAGE_LIBS $LIBDOVECOT_STORAGE_LAST"
+  LIBDOVECOT_STORAGE_DEPS='$(top_builddir)/src/lib-storage/libstorage.la'
   LIBDOVECOT_LOGIN='$(top_builddir)/src/login-common/liblogin.la'
   LIBDOVECOT_COMPRESS='$(top_builddir)/src/lib-compression/libcompression.la'
   LIBDOVECOT_LDA='$(top_builddir)/src/lib-lda/liblda.la'
 fi
-LIBDOVECOT_STORAGE="$LIBDOVECOT_STORAGE_DEPS $LINKED_STORAGE_LDADD"
+LIBDOVECOT_STORAGE="$LIBDOVECOT_STORAGE_DEPS"
 LIBDOVECOT_DSYNC='$(top_builddir)/src/doveadm/dsync/libdovecot-dsync.la'
 LIBDOVECOT_SQL='$(top_builddir)/src/lib-sql/libsql.la'
 AC_SUBST(LIBDOVECOT)
diff -r 16c21c12e21f -r 3ac5933082c4 src/lib-storage/Makefile.am
--- a/src/lib-storage/Makefile.am	Fri Feb 13 14:35:54 2015 +0200
+++ b/src/lib-storage/Makefile.am	Fri Feb 13 16:38:35 2015 +0200
@@ -1,6 +1,6 @@
 SUBDIRS = list index register
 
-noinst_LTLIBRARIES = libstorage.la libstorage_service.la
+noinst_LTLIBRARIES = libstorage.la
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
@@ -37,6 +37,7 @@
 	mail-search-register-imap.c \
 	mail-storage.c \
 	mail-storage-hooks.c \
+	mail-storage-service.c \
 	mail-storage-settings.c \
 	mail-thread.c \
 	mail-user.c \
@@ -50,9 +51,6 @@
 	mailbox-tree.c \
 	mailbox-uidvalidity.c
 
-libstorage_service_la_SOURCES = \
-	mail-storage-service.c
-
 headers = \
 	fail-mail-storage.h \
 	mail-copy.h \
@@ -81,8 +79,6 @@
 
 shlibs = \
 	@LINKED_STORAGE_LIBS@ \
-	libstorage.la \
-	libstorage_service.la \
 	list/libstorage_list.la \
 	index/libstorage_index.la \
 	register/libstorage_register.la \
@@ -90,10 +86,13 @@
 	../lib-imap-storage/libimap-storage.la \
 	../lib-dovecot/libdovecot.la
 
+libstorage_la_LIBADD = $(shlibs)
+libstorage_la_DEPENDENCIES = $(shlibs)
+
 pkglib_LTLIBRARIES = libdovecot-storage.la
 libdovecot_storage_la_SOURCES = 
-libdovecot_storage_la_LIBADD = $(shlibs) $(LINKED_STORAGE_LDADD)
-libdovecot_storage_la_DEPENDENCIES = $(shlibs)
+libdovecot_storage_la_LIBADD = libstorage.la $(LINKED_STORAGE_LDADD)
+libdovecot_storage_la_DEPENDENCIES = libstorage.la
 libdovecot_storage_la_LDFLAGS = -export-dynamic
 
 test_programs = \