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.

diff --git a/configure.ac b/configure.ac
index 993c3aa47ed79990da2870ae270406cf4bafef26..652aa4fb9c72a0fae9ac2c920a1ba949a8d207a9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2551,14 +2551,15 @@ if test "$want_shared_libs" = "yes"; then
 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 --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am
index 41509a34325b9f8bbab45469803d30f38e422b50..5022cf4a19caf96b3cc313047db8a297c37c65bf 100644 (file)
--- a/src/lib-storage/Makefile.am
+++ b/src/lib-storage/Makefile.am
@@ -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 @@ libstorage_la_SOURCES = \
        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 @@ libstorage_la_SOURCES = \
        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 @@ headers = \
 
 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 @@ shlibs = \
        ../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 = \