lib-storage: Split off lib-storage-lua

diff --git a/configure.ac b/configure.ac
index 3d7bce0dd48d21d3f3db208b614e8e817492bab9..71bbccc93c2cd6f233e88f8a9da907a60275dadb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -890,6 +890,7 @@ src/lib-storage/index/dbox-multi/Makefile
 src/lib-storage/index/dbox-single/Makefile
 src/lib-storage/index/raw/Makefile
 src/lib-storage/index/shared/Makefile
+src/lib-storage-lua/Makefile
 src/lib-var-expand/Makefile
 src/lib-var-expand-crypt/Makefile
 src/anvil/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index 7b9ab145ca1edcbc16188fd4f3cca79698e9a3e3..56d631174210a7091485ad3ada533d20f45cdd13 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@ LIB_LDAP=lib-ldap
 endif
 if HAVE_LUA
 LIB_LUA=lib-lua
+LIBSTORAGE_LUA=lib-storage-lua
 endif
 if BUILD_IMAP_HIBERNATE
 IMAP_HIBERNATE=imap-hibernate
@@ -50,6 +51,7 @@ SUBDIRS = \
        lib-compression \
        lib-index \
        lib-storage \
+       $(LIBSTORAGE_LUA) \
        lib-imap-urlauth \
        lib-sql \
        lib-lda \

diff --git a/src/lib-storage-lua/Makefile.am b/src/lib-storage-lua/Makefile.am
new file mode 100644 (file)
index 0000000..6c9d3d1
--- /dev/null
+++ b/src/lib-storage-lua/Makefile.am
@@ -0,0 +1,30 @@
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/lib \
+       -I$(top_srcdir)/src/lib-var-expand \
+       -I$(top_srcdir)/src/lib-mail \
+       -I$(top_srcdir)/src/lib-index \
+       -I$(top_srcdir)/src/lib-storage \
+       $(LUA_CFLAGS) \
+       -I$(top_srcdir)/src/lib-lua
+
+pkglib_LTLIBRARIES = libdovecot-storage-lua.la
+libdovecot_storage_lua_la_SOURCES = \
+       mail-lua.c \
+       mail-user-lua.c \
+       mail-storage-lua.c \
+       mailbox-lua.c \
+       mailbox-attribute-lua.c
+libdovecot_storage_lua_la_LIBADD = \
+       ../lib-storage/libdovecot-storage.la \
+       ../lib-lua/libdovecot-lua.la
+libdovecot_storage_lua_la_DEPENDENCIES = \
+       ../lib-storage/libdovecot-storage.la \
+       ../lib-lua/libdovecot-lua.la
+libdovecot_storage_lua_la_LDFLAGS = -export-dynamic
+
+headers = \
+       mail-storage-lua.h \
+       mail-storage-lua-private.h
+
+pkginc_libdir=$(pkgincludedir)
+pkginc_lib_HEADERS = $(headers)

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

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

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

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

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

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

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

diff --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am
index 7f5e58615d6296a32c962d86cc48ac165f2032f2..19ddd1d05231507b6666c754e22f1dbf53e6cfe9 100644 (file)
--- a/src/lib-storage/Makefile.am
+++ b/src/lib-storage/Makefile.am
@@ -141,31 +141,6 @@ 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-lua.c \
-       mail-user-lua.c \
-       mail-storage-lua.c \
-       mailbox-lua.c \
-       mailbox-attribute-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 \
-       mail-storage-lua-private.h
-endif
-
 test_programs = \
        test-mail-search-args-imap \
        test-mail-search-args-simplify \

diff --git a/src/plugins/mail-lua/Makefile.am b/src/plugins/mail-lua/Makefile.am
index fcb81f61d27d2cfbda168428cb8720824be2296b..d192c09bbe0c2cf234a0e89290865d868b342547 100644 (file)
--- a/src/plugins/mail-lua/Makefile.am
+++ b/src/plugins/mail-lua/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-settings \
        -I$(top_srcdir)/src/lib-lua \
        -I$(top_srcdir)/src/lib-var-expand \
+       -I$(top_srcdir)/src/lib-storage-lua \
        $(LUA_CFLAGS)
 
 NOPLUGIN_LDFLAGS =
@@ -17,7 +18,7 @@ module_LTLIBRARIES = \
 
 lib01_mail_lua_plugin_la_LDFLAGS = -module -avoid-version $(LUA_LIBS)
 lib01_mail_lua_plugin_la_LIBADD = \
-       ../../lib-storage/libdovecot-storage-lua.la \
+       ../../lib-storage-lua/libdovecot-storage-lua.la \
        $(LIBDOVECOT)
 lib01_mail_lua_plugin_la_SOURCES = \
        mail-lua-plugin.c \

diff --git a/src/plugins/push-notification/Makefile.am b/src/plugins/push-notification/Makefile.am
index 083f735f17804f8d257866ad52bf7e0768354562..fd56f09a6f8d7f481093cc5938f0cd9f47dac0e8 100644 (file)
--- a/src/plugins/push-notification/Makefile.am
+++ b/src/plugins/push-notification/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-storage \
        -I$(top_srcdir)/src/lib-ssl-iostream \
        -I$(top_srcdir)/src/lib-var-expand \
+       -I$(top_srcdir)/src/lib-storage-lua \
        -I$(top_srcdir)/src/plugins/notify
 
 NOPLUGIN_LDFLAGS =