From: Timo Sirainen Date: Thu, 29 Jul 2021 17:54:28 +0000 (+0300) Subject: doveadm: Move doveadm-client related code to lib-doveadm X-Git-Tag: 2.4.0~4757 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50079de91bf8d4653d2242e792c907d22615cf0a;p=thirdparty%2Fdovecot%2Fcore.git doveadm: Move doveadm-client related code to lib-doveadm --- diff --git a/configure.ac b/configure.ac index 23c6f77f4d..dbabab9ab9 100644 --- a/configure.ac +++ b/configure.ac @@ -617,6 +617,7 @@ dnl ** Shared libraries usage dnl ** LIBDOVECOT_LA_LIBS='\ + $(top_builddir)/src/lib-doveadm/libdoveadm.la \ $(top_builddir)/src/lib-dict-extra/libdict_extra.la \ $(top_builddir)/src/lib-oauth2/liboauth2.la \ $(top_builddir)/src/lib-smtp/libsmtp.la \ @@ -838,6 +839,7 @@ src/lib-dict/Makefile src/lib-dict-backend/Makefile src/lib-dict-extra/Makefile src/lib-dns/Makefile +src/lib-doveadm/Makefile src/lib-fs/Makefile src/lib-fts/Makefile src/lib-http/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index aa0af22f8f..ee249fdc2a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,8 @@ LIBDOVECOT_SUBDIRS = \ lib-smtp \ lib-imap \ lib-imap-storage \ - lib-oauth2 + lib-oauth2 \ + lib-doveadm SUBDIRS = \ $(LIBDOVECOT_SUBDIRS) \ diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am index 274e4f66f9..77312d2069 100644 --- a/src/doveadm/Makefile.am +++ b/src/doveadm/Makefile.am @@ -13,6 +13,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-auth \ -I$(top_srcdir)/src/lib-compression \ -I$(top_srcdir)/src/lib-dict \ + -I$(top_srcdir)/src/lib-doveadm \ -I$(top_srcdir)/src/lib-fs \ -I$(top_srcdir)/src/lib-ssl-iostream \ -I$(top_srcdir)/src/lib-master \ @@ -134,9 +135,7 @@ common = \ doveadm-print.c \ doveadm-settings.c \ doveadm-util.c \ - server-connection.c \ - doveadm-print-formatted.c \ - doveadm-protocol.c + doveadm-print-formatted.c doveadm_SOURCES = \ $(common) \ @@ -169,14 +168,12 @@ pkginc_lib_HEADERS = \ doveadm-mailbox-list-iter.h \ doveadm-print.h \ doveadm-print-private.h \ - doveadm-protocol.h \ doveadm-settings.h \ doveadm-util.h noinst_HEADERS = \ client-connection.h \ client-connection-private.h \ - server-connection.h \ doveadm-who.h install-exec-local: diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c index 9b192f94ea..fe87005e8a 100644 --- a/src/doveadm/doveadm-dsync.c +++ b/src/doveadm/doveadm-dsync.c @@ -29,7 +29,7 @@ #include "doveadm-mail.h" #include "doveadm-print.h" #include "client-connection.h" -#include "server-connection.h" +#include "doveadm-client.h" #include "dsync/dsync-brain.h" #include "dsync/dsync-ibc.h" #include "doveadm-dsync.h" diff --git a/src/doveadm/doveadm-mail-server.c b/src/doveadm/doveadm-mail-server.c index 229548f1d9..808faf2eaf 100644 --- a/src/doveadm/doveadm-mail-server.c +++ b/src/doveadm/doveadm-mail-server.c @@ -14,7 +14,7 @@ #include "auth-master.h" #include "mail-storage.h" #include "mail-storage-service.h" -#include "server-connection.h" +#include "doveadm-client.h" #include "doveadm-settings.h" #include "doveadm-print.h" #include "doveadm-mail.h" diff --git a/src/lib-doveadm/Makefile.am b/src/lib-doveadm/Makefile.am new file mode 100644 index 0000000000..3a60895d80 --- /dev/null +++ b/src/lib-doveadm/Makefile.am @@ -0,0 +1,19 @@ +noinst_LTLIBRARIES = libdoveadm.la + +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/lib \ + -I$(top_srcdir)/src/lib-auth \ + -I$(top_srcdir)/src/lib-mail \ + -I$(top_srcdir)/src/lib-master \ + -I$(top_srcdir)/src/lib-ssl-iostream + +libdoveadm_la_SOURCES = \ + doveadm-client.c \ + doveadm-protocol.c + +headers = \ + doveadm-client.h \ + doveadm-protocol.h + +pkginc_libdir = $(pkgincludedir) +pkginc_lib_HEADERS = $(headers) diff --git a/src/doveadm/server-connection.c b/src/lib-doveadm/doveadm-client.c similarity index 99% rename from src/doveadm/server-connection.c rename to src/lib-doveadm/doveadm-client.c index 946632fbf4..292a7cd0e6 100644 --- a/src/doveadm/server-connection.c +++ b/src/lib-doveadm/doveadm-client.c @@ -12,7 +12,7 @@ #include "iostream-ssl.h" #include "master-service.h" #include "doveadm-protocol.h" -#include "server-connection.h" +#include "doveadm-client.h" #define DOVEADM_LOG_CHANNEL_ID 'L' diff --git a/src/doveadm/server-connection.h b/src/lib-doveadm/doveadm-client.h similarity index 98% rename from src/doveadm/server-connection.h rename to src/lib-doveadm/doveadm-client.h index 4cdcde7fb1..7d21282ff3 100644 --- a/src/doveadm/server-connection.h +++ b/src/lib-doveadm/doveadm-client.h @@ -1,5 +1,5 @@ -#ifndef SERVER_CONNECTION_H -#define SERVER_CONNECTION_H +#ifndef DOVEADM_CLIENT_H +#define DOVEADM_CLIENT_H #include "auth-proxy.h" #include "iostream-ssl.h" diff --git a/src/doveadm/doveadm-protocol.c b/src/lib-doveadm/doveadm-protocol.c similarity index 100% rename from src/doveadm/doveadm-protocol.c rename to src/lib-doveadm/doveadm-protocol.c diff --git a/src/doveadm/doveadm-protocol.h b/src/lib-doveadm/doveadm-protocol.h similarity index 100% rename from src/doveadm/doveadm-protocol.h rename to src/lib-doveadm/doveadm-protocol.h diff --git a/src/plugins/acl/Makefile.am b/src/plugins/acl/Makefile.am index 8a5323e35d..2f0000af9a 100644 --- a/src/plugins/acl/Makefile.am +++ b/src/plugins/acl/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/list \ + -I$(top_srcdir)/src/lib-doveadm \ -I$(top_srcdir)/src/doveadm NOPLUGIN_LDFLAGS = diff --git a/src/plugins/fts-lucene/Makefile.am b/src/plugins/fts-lucene/Makefile.am index d68e6aed28..a6e9f2c418 100644 --- a/src/plugins/fts-lucene/Makefile.am +++ b/src/plugins/fts-lucene/Makefile.am @@ -6,6 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/plugins/fts \ + -I$(top_srcdir)/src/lib-doveadm \ -I$(top_srcdir)/src/doveadm AM_CXXFLAGS = \ diff --git a/src/plugins/fts/Makefile.am b/src/plugins/fts/Makefile.am index 2e7753c947..759e35995c 100644 --- a/src/plugins/fts/Makefile.am +++ b/src/plugins/fts/Makefile.am @@ -12,6 +12,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-index \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-storage/index \ + -I$(top_srcdir)/src/lib-doveadm \ -I$(top_srcdir)/src/doveadm NOPLUGIN_LDFLAGS = diff --git a/src/plugins/mail-crypt/Makefile.am b/src/plugins/mail-crypt/Makefile.am index 942dc87894..f240a2ad2c 100644 --- a/src/plugins/mail-crypt/Makefile.am +++ b/src/plugins/mail-crypt/Makefile.am @@ -10,6 +10,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage \ -I$(top_srcdir)/src/lib-dcrypt \ -I$(top_srcdir)/src/lib-fs \ + -I$(top_srcdir)/src/lib-doveadm \ -I$(top_srcdir)/src/doveadm \ -I$(top_srcdir)/src/plugins/acl diff --git a/src/plugins/quota/Makefile.am b/src/plugins/quota/Makefile.am index e8bad8c414..5e8e5ba8a8 100644 --- a/src/plugins/quota/Makefile.am +++ b/src/plugins/quota/Makefile.am @@ -20,6 +20,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-storage/index/imapc \ -I$(top_srcdir)/src/lib-storage/index/maildir \ -I$(top_srcdir)/src/lib-program-client \ + -I$(top_srcdir)/src/lib-doveadm \ -I$(top_srcdir)/src/doveadm \ $(LIBTIRPC_CFLAGS)