lib-storage: Split off shared library to lib-dovecot-storage

This removes lib-imap-storage dependency from lib-storage.

diff --git a/configure.ac b/configure.ac
index 4c4608d99df01ebd91e45d98844f9265bc74cf5d..f092b759f3e903c76ee3513f84712a41ee8f53b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -612,7 +612,7 @@ LIBDOVECOT_LUA=''
 if test "$want_shared_libs" = "yes"; then
   LIBDOVECOT_DEPS='$(top_builddir)/src/lib-dovecot/libdovecot.la'
   LIBDOVECOT="$LIBDOVECOT_DEPS \$(MODULE_LIBS) \$(LIBPCRE_LIBS)"
-  LIBDOVECOT_STORAGE_DEPS='$(top_builddir)/src/lib-storage/libdovecot-storage.la'
+  LIBDOVECOT_STORAGE_DEPS='$(top_builddir)/src/lib-dovecot-storage/libdovecot-storage.la'
   LIBDOVECOT_LOGIN='$(top_builddir)/src/login-common/libdovecot-login.la'
   LIBDOVECOT_LDA='$(top_builddir)/src/lib-lda/libdovecot-lda.la'
   if test $want_lua != no; then
@@ -624,7 +624,7 @@ if test "$want_shared_libs" = "yes"; then
 else
   LIBDOVECOT_DEPS="$LIBDOVECOT_LA_LIBS"
   LIBDOVECOT="$LIBDOVECOT_DEPS \$(MODULE_LIBS) \$(LIBPCRE_LIBS)"
-  LIBDOVECOT_STORAGE_DEPS='$(top_builddir)/src/lib-storage/libstorage.la'
+  LIBDOVECOT_STORAGE_DEPS='$(top_builddir)/src/lib-imap-storage/libimap-storage.la $(top_builddir)/src/lib-storage/libstorage.la'
   LIBDOVECOT_LOGIN='$(top_builddir)/src/login-common/liblogin.la'
   LIBDOVECOT_LDA='$(top_builddir)/src/lib-lda/liblda.la'
   if test $want_lua != no; then
@@ -873,6 +873,7 @@ src/lib-program-client/Makefile
 src/lib-otp/Makefile
 src/lib-dovecot/Makefile
 src/lib-dovecot-gssapi/Makefile
+src/lib-dovecot-storage/Makefile
 src/lib-sasl/Makefile
 src/lib-settings/Makefile
 src/lib-smtp/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index 244822a29e45e92950dbf654046b376316927c31..050933687e596d52622dc5537ff1c0fe60fda641 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,6 +55,7 @@ SUBDIRS = \
        lib-compression \
        lib-index \
        lib-storage \
+       lib-dovecot-storage \
        $(LIBSTORAGE_LUA) \
        lib-imap-urlauth \
        lib-sql \

diff --git a/src/lib-dovecot-storage/Makefile.am b/src/lib-dovecot-storage/Makefile.am
new file mode 100644 (file)
index 0000000..05dc847
--- /dev/null
+++ b/src/lib-dovecot-storage/Makefile.am
@@ -0,0 +1,12 @@
+pkglib_LTLIBRARIES = libdovecot-storage.la
+libdovecot_storage_la_SOURCES =
+libdovecot_storage_la_LIBADD = \
+       ../lib-storage/libstorage.la \
+       ../lib-imap-storage/libimap-storage.la \
+       $(LIBDOVECOT) \
+       $(LINKED_STORAGE_LDADD)
+libdovecot_storage_la_DEPENDENCIES = \
+       ../lib-storage/libstorage.la \
+       ../lib-imap-storage/libimap-storage.la \
+       $(LIBDOVECOT_DEPS)
+libdovecot_storage_la_LDFLAGS = -export-dynamic

diff --git a/src/lib-storage-lua/Makefile.am b/src/lib-storage-lua/Makefile.am
index 6c9d3d159d818f86ec1b5a39991bc65a62fba824..bcc9bc6b9105f3d4f08fd1099efc80c065c55a67 100644 (file)
--- a/src/lib-storage-lua/Makefile.am
+++ b/src/lib-storage-lua/Makefile.am
@@ -15,10 +15,10 @@ libdovecot_storage_lua_la_SOURCES = \
        mailbox-lua.c \
        mailbox-attribute-lua.c
 libdovecot_storage_lua_la_LIBADD = \
-       ../lib-storage/libdovecot-storage.la \
+       ../lib-dovecot-storage/libdovecot-storage.la \
        ../lib-lua/libdovecot-lua.la
 libdovecot_storage_lua_la_DEPENDENCIES = \
-       ../lib-storage/libdovecot-storage.la \
+       ../lib-dovecot-storage/libdovecot-storage.la \
        ../lib-lua/libdovecot-lua.la
 libdovecot_storage_lua_la_LDFLAGS = -export-dynamic
 

diff --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am
index 19ddd1d05231507b6666c754e22f1dbf53e6cfe9..b8c33634e1586c99c45aa5b7622e688236642255 100644 (file)
--- a/src/lib-storage/Makefile.am
+++ b/src/lib-storage/Makefile.am
@@ -124,23 +124,11 @@ shlibs = \
        list/libstorage_list.la \
        index/libstorage_index.la \
        ../lib-index/libindex.la \
-       ../lib-imap-storage/libimap-storage.la \
        ../lib-language/liblanguage.la
 
 libstorage_la_LIBADD = $(shlibs)
 libstorage_la_DEPENDENCIES = $(shlibs)
 
-pkglib_LTLIBRARIES = libdovecot-storage.la
-libdovecot_storage_la_SOURCES =
-libdovecot_storage_la_LIBADD = \
-       libstorage.la \
-       $(LIBDOVECOT) \
-       $(LINKED_STORAGE_LDADD)
-libdovecot_storage_la_DEPENDENCIES = \
-       libstorage.la \
-       $(LIBDOVECOT_DEPS)
-libdovecot_storage_la_LDFLAGS = -export-dynamic
-
 test_programs = \
        test-mail-search-args-imap \
        test-mail-search-args-simplify \