lib-storage: Move storage related lua code into libdovecot-storage-lua.la

This keeps all the storage code in one place.

diff --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am
index a57aab08e469553a4b1aad0c7c350ba6e38a72a6..a04b3cfc4b1b27184cd1baee2d7c6adb601d3ff6 100644 (file)
--- a/src/lib-storage/Makefile.am
+++ b/src/lib-storage/Makefile.am
@@ -135,6 +135,26 @@ libdovecot_storage_la_DEPENDENCIES = \
        $(LIBDOVECOT_DEPS)
 libdovecot_storage_la_LDFLAGS = -export-dynamic
 
+if HAVE_LUA
+pkglib_LTLIBRARIES += libdovecot-storage-lua.la
+libdovecot_storage_lua_la_SOURCES = \
+       mail-storage-lua.c
+libdovecot_storage_lua_la_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       $(LUA_CFLAGS) \
+       -I$(top_srcdir)/src/lib-lua
+libdovecot_storage_lua_la_LIBADD = \
+       libdovecot-storage.la \
+       ../lib-lua/libdovecot-lua.la
+libdovecot_storage_lua_la_DEPENDENCIES = \
+       libdovecot-storage.la \
+       ../lib-lua/libdovecot-lua.la
+libdovecot_storage_lua_la_LDFLAGS = -export-dynamic
+
+headers += \
+       mail-storage-lua.h
+endif
+
 test_programs = \
        test-mail-search-args-imap \
        test-mail-search-args-simplify \

diff --git a/src/plugins/mail-lua/mail-storage-lua.c b/src/lib-storage/mail-storage-lua.c
similarity index 100%
rename from src/plugins/mail-lua/mail-storage-lua.c
rename to src/lib-storage/mail-storage-lua.c

diff --git a/src/plugins/mail-lua/mail-storage-lua.h b/src/lib-storage/mail-storage-lua.h
similarity index 100%
rename from src/plugins/mail-lua/mail-storage-lua.h
rename to src/lib-storage/mail-storage-lua.h

diff --git a/src/plugins/mail-lua/Makefile.am b/src/plugins/mail-lua/Makefile.am
index 576b53a8635bd50b2b2595e753e17bb0ea2304c0..1698cb424b0bb99a98edd3e645ec1ddbb985def2 100644 (file)
--- a/src/plugins/mail-lua/Makefile.am
+++ b/src/plugins/mail-lua/Makefile.am
@@ -13,16 +13,14 @@ module_LTLIBRARIES = \
 
 lib01_mail_lua_plugin_la_LDFLAGS = -module -avoid-version $(LUA_LIBS)
 lib01_mail_lua_plugin_la_LIBADD = \
-       ../../lib-lua/libdovecot-lua.la \
+       ../../lib-storage/libdovecot-storage-lua.la \
        $(LIBDOVECOT)
 lib01_mail_lua_plugin_la_SOURCES = \
-       mail-lua-plugin.c \
-       mail-storage-lua.c
+       mail-lua-plugin.c
 
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = \
-       mail-lua-plugin.h \
-       mail-storage-lua.h
+       mail-lua-plugin.h
 
 test_programs =