dsync: Moved doveadm-specific code to doveadm directory.

diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am
index 4e4d6ddf720ef1334feea70021df00750f2c9833..a7767989aff900d5c348e84cdce5482e1f88bd23 100644 (file)
--- a/src/doveadm/Makefile.am
+++ b/src/doveadm/Makefile.am
@@ -34,7 +34,7 @@ cmd_pw_libs = \
        ../lib-otp/libotp.a
 
 libs = \
-       dsync/libdoveadm_dsync.la \
+       dsync/libdsync.la \
        ../lib-compression/libcompression.la
 
 doveadm_LDADD = \
@@ -59,6 +59,7 @@ doveadm_server_DEPENDENCIES = \
        $(LIBDOVECOT_DEPS)
 
 common = \
+       doveadm-dsync.c \
        doveadm-mail.c \
        doveadm-mail-altmove.c \
        doveadm-mail-batch.c \
@@ -121,6 +122,7 @@ doveadm_server_SOURCES = \
 pkginc_libdir = $(pkgincludedir)
 pkginc_lib_HEADERS = \
        doveadm.h \
+       doveadm-dsync.h \
        doveadm-dump.h \
        doveadm-mail.h \
        doveadm-mail-iter.h \

diff --git a/src/doveadm/dsync/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c
similarity index 99%
rename from src/doveadm/dsync/doveadm-dsync.c
rename to src/doveadm/doveadm-dsync.c
index 772919a7dcffe5de7c8be58f6f2e4dea28066dd0..b54be5fba24a8b5bb65e3b5edba2b12b481f07c0 100644 (file)
--- a/src/doveadm/dsync/doveadm-dsync.c
+++ b/src/doveadm/doveadm-dsync.c
@@ -26,8 +26,8 @@
 #include "doveadm-server.h"
 #include "client-connection.h"
 #include "server-connection.h"
-#include "dsync-brain.h"
-#include "dsync-ibc.h"
+#include "dsync/dsync-brain.h"
+#include "dsync/dsync-ibc.h"
 #include "doveadm-dsync.h"
 
 #include <stdio.h>

diff --git a/src/doveadm/dsync/doveadm-dsync.h b/src/doveadm/doveadm-dsync.h
similarity index 100%
rename from src/doveadm/dsync/doveadm-dsync.h
rename to src/doveadm/doveadm-dsync.h

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index f62fb4c1c82376fb470a43cbda9dc9fa8304b4f8..f233109af36d9d6b7249e6f6b9ec76592db0a43e 100644 (file)
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -20,7 +20,7 @@
 #include "doveadm.h"
 #include "doveadm-settings.h"
 #include "doveadm-print.h"
-#include "dsync/doveadm-dsync.h"
+#include "doveadm-dsync.h"
 #include "doveadm-mail.h"
 
 #include <stdio.h>

diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index 5022eee446b3013311024ecb4ed3ae80d258d85d..41357b9a9895240a2cf87912a9fd6220390d9a26 100644 (file)
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -12,7 +12,7 @@
 #include "doveadm-dump.h"
 #include "doveadm-mail.h"
 #include "doveadm-settings.h"
-#include "dsync/doveadm-dsync.h"
+#include "doveadm-dsync.h"
 #include "doveadm.h"
 
 #include <stdlib.h>

diff --git a/src/doveadm/dsync/Makefile.am b/src/doveadm/dsync/Makefile.am
index c1a34d91ff5f7b4b0c4d9e2b34fb7290ca8f9c82..fcda6454e490a1122ab9649644bc29725b9be375 100644 (file)
--- a/src/doveadm/dsync/Makefile.am
+++ b/src/doveadm/dsync/Makefile.am
@@ -1,5 +1,5 @@
 pkglib_LTLIBRARIES = libdovecot-dsync.la
-noinst_LTLIBRARIES = libdsync.la libdoveadm_dsync.la
+noinst_LTLIBRARIES = libdsync.la
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
@@ -10,8 +10,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib-mail \
        -I$(top_srcdir)/src/lib-imap \
        -I$(top_srcdir)/src/lib-index \
-       -I$(top_srcdir)/src/lib-storage \
-       -I$(top_srcdir)/src/doveadm
+       -I$(top_srcdir)/src/lib-storage
 
 libdsync_la_SOURCES = \
        dsync-brain.c \
@@ -34,10 +33,6 @@ libdsync_la_SOURCES = \
        dsync-ibc-pipe.c \
        dsync-transaction-log-scan.c
 
-libdoveadm_dsync_la_SOURCES = doveadm-dsync.c
-libdoveadm_dsync_la_LIBADD = libdsync.la
-libdoveadm_dsync_la_DEPENDENCIES = libdsync.la
-
 libdovecot_dsync_la_SOURCES =
 libdovecot_dsync_la_LIBADD = libdsync.la ../../lib-storage/libdovecot-storage.la
 libdovecot_dsync_la_DEPENDENCIES = libdsync.la
@@ -49,7 +44,6 @@ pkginc_lib_HEADERS = \
        dsync-ibc.h
 
 noinst_HEADERS = \
-       doveadm-dsync.h \
        dsync-brain-private.h \
        dsync-mail.h \
        dsync-mailbox.h \