From cd4507f0957e8fd962b1eb8b75df8e9bdbbf8305 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sat, 3 Mar 2018 10:59:23 +0100
Subject: [PATCH] Move mail-raw from lib-sieve-tool to lib-sieve/util.
Needed for use in test suite.
---
src/lib-sieve-tool/Makefile.am | 7 +++----
src/lib-sieve/util/Makefile.am | 2 ++
src/{lib-sieve-tool => lib-sieve/util}/mail-raw.c | 0
src/{lib-sieve-tool => lib-sieve/util}/mail-raw.h | 0
src/testsuite/Makefile.am | 1 +
5 files changed, 6 insertions(+), 4 deletions(-)
rename src/{lib-sieve-tool => lib-sieve/util}/mail-raw.c (100%)
rename src/{lib-sieve-tool => lib-sieve/util}/mail-raw.h (100%)
diff --git a/src/lib-sieve-tool/Makefile.am b/src/lib-sieve-tool/Makefile.am
index ad38571ed..33868248b 100644
--- a/src/lib-sieve-tool/Makefile.am
+++ b/src/lib-sieve-tool/Makefile.am
@@ -2,13 +2,12 @@ noinst_LTLIBRARIES = libsieve-tool.la
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib-sieve \
+ -I$(top_srcdir)/src/lib-sieve/util \
$(LIBDOVECOT_INCLUDE) \
$(LIBDOVECOT_SERVICE_INCLUDE)
libsieve_tool_la_SOURCES = \
- sieve-tool.c \
- mail-raw.c
+ sieve-tool.c
noinst_HEADERS = \
- sieve-tool.h \
- mail-raw.h
+ sieve-tool.h
diff --git a/src/lib-sieve/util/Makefile.am b/src/lib-sieve/util/Makefile.am
index 8f2d8c5e8..f3f51a528 100644
--- a/src/lib-sieve/util/Makefile.am
+++ b/src/lib-sieve/util/Makefile.am
@@ -8,10 +8,12 @@ AM_CPPFLAGS = \
libsieve_util_la_DEPENDENCIES = $(LIBDOVECOT_STORAGE_DEPS) $(LIBDOVECOT_DEPS)
libsieve_util_la_SOURCES = \
+ mail-raw.c \
edit-mail.c \
rfc2822.c
headers = \
+ mail-raw.h \
edit-mail.h \
rfc2822.h
diff --git a/src/lib-sieve-tool/mail-raw.c b/src/lib-sieve/util/mail-raw.c
similarity index 100%
rename from src/lib-sieve-tool/mail-raw.c
rename to src/lib-sieve/util/mail-raw.c
diff --git a/src/lib-sieve-tool/mail-raw.h b/src/lib-sieve/util/mail-raw.h
similarity index 100%
rename from src/lib-sieve-tool/mail-raw.h
rename to src/lib-sieve/util/mail-raw.h
diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.am
index 8da7625fb..f7b85dc7f 100644
--- a/src/testsuite/Makefile.am
+++ b/src/testsuite/Makefile.am
@@ -2,6 +2,7 @@ noinst_PROGRAMS = testsuite
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib-sieve \
+ -I$(top_srcdir)/src/lib-sieve/util \
-I$(top_srcdir)/src/lib-sieve/plugins/variables \
-I$(top_srcdir)/src/lib-sieve-tool \
$(LIBDOVECOT_INCLUDE) \
--
GitLab