dovecot-2.0-sieve: Restructured handling of Dovecot includes in ...
pigeonhole at rename-it.nl
pigeonhole at rename-it.nl
Sat Jan 2 17:16:30 EET 2010
details: http://hg.rename-it.nl/dovecot-2.0-sieve/rev/968a695f1a6a
changeset: 1173:968a695f1a6a
user: Stephan Bosch <stephan at rename-it.nl>
date: Sat Jan 02 16:16:24 2010 +0100
description:
Restructured handling of Dovecot includes in makefiles.
diffstat:
configure.in | 25 +++++-------
src/lib-sieve-tool/Makefile.am | 3 +-
src/lib-sieve/Makefile.am | 2 +-
src/lib-sieve/plugins/body/Makefile.am | 2 +-
src/lib-sieve/plugins/comparator-i-ascii-numeric/Makefile.am | 2 +-
src/lib-sieve/plugins/copy/Makefile.am | 2 +-
src/lib-sieve/plugins/date/Makefile.am | 2 +-
src/lib-sieve/plugins/enotify/Makefile.am | 2 +-
src/lib-sieve/plugins/environment/Makefile.am | 2 +-
src/lib-sieve/plugins/imap4flags/Makefile.am | 2 +-
src/lib-sieve/plugins/include/Makefile.am | 2 +-
src/lib-sieve/plugins/mailbox/Makefile.am | 2 +-
src/lib-sieve/plugins/notify/Makefile.am | 3 +-
src/lib-sieve/plugins/regex/Makefile.am | 2 +-
src/lib-sieve/plugins/relational/Makefile.am | 2 +-
src/lib-sieve/plugins/spamvirustest/Makefile.am | 2 +-
src/lib-sieve/plugins/subaddress/Makefile.am | 2 +-
src/lib-sieve/plugins/vacation/Makefile.am | 2 +-
src/lib-sieve/plugins/variables/Makefile.am | 2 +-
src/plugins/lda-sieve/Makefile.am | 3 +-
src/sieve-tools/Makefile.am | 3 +-
src/sieve-tools/debug/Makefile.am | 2 +-
src/testsuite/Makefile.am | 3 +-
23 files changed, 36 insertions(+), 38 deletions(-)
diffs (truncated from 329 to 300 lines):
diff -r bae6e37d4164 -r 968a695f1a6a configure.in
--- a/configure.in Sat Jan 02 13:56:11 2010 +0100
+++ b/configure.in Sat Jan 02 16:16:24 2010 +0100
@@ -102,26 +102,22 @@
LIBDOVECOT='$(dovecot_libdir)/src/lib-dovecot/libdovecot.la'
LIBDOVECOT_STORAGE='$(dovecot_libdir)/src/lib-storage/libdovecot-storage.la'
- SIEVE_DOVECOT_INCLUDE=' \
+ LIBDOVECOT_INCLUDE=' \
-I$(dovecot_incdir) \
-I$(dovecot_incdir)/src/lib \
-I$(dovecot_incdir)/src/lib-mail \
- -I$(dovecot_incdir)/src/lib-storage'
-
- SIEVE_LIB_DOVECOT_INCLUDE=${SIEVE_DOVECOT_INCLUDE}' \
+ -I$(dovecot_incdir)/src/lib-storage \
-I$(dovecot_incdir)/src/lib-imap \
-I$(dovecot_incdir)/src/lib-master'
- SIEVE_LDA_DOVECOT_INCLUDE=${SIEVE_DOVECOT_INCLUDE}' \
+ LIBDOVECOT_LDA_INCLUDE=' \
-I$(dovecot_incdir)/src/lib-dict \
-I$(dovecot_incdir)/src/lib-lda \
-I$(dovecot_incdir)/src/lda'
- SIEVE_TOOL_DOVECOT_INCLUDE=${SIEVE_DOVECOT_INCLUDE}' \
+ LIBDOVECOT_STORAGE_INCLUDE=' \
-I$(dovecot_incdir)/src/lib-settings \
- -I$(dovecot_incdir)/src/lib-imap \
-I$(dovecot_incdir)/src/lib-index \
- -I$(dovecot_incdir)/src/lib-master \
-I$(dovecot_incdir)/src/lib-storage/index \
-I$(dovecot_incdir)/src/lib-storage/index/raw'
else
@@ -133,10 +129,9 @@
LIBDOVECOT='$(dovecot_libdir)/libdovecot.la'
LIBDOVECOT_STORAGE='$(dovecot_libdir)/libdovecot-storage.la'
- SIEVE_DOVECOT_INCLUDE='-I$(dovecot_incdir)'
- SIEVE_LIB_DOVECOT_INCLUDE=${SIEVE_DOVECOT_INCLUDE}
- SIEVE_LDA_DOVECOT_INCLUDE=${SIEVE_DOVECOT_INCLUDE}
- SIEVE_TOOL_DOVECOT_INCLUDE=${SIEVE_DOVECOT_INCLUDE}
+ LIBDOVECOT_INCLUDE='-I$(dovecot_incdir)'
+ LIBDOVECOT_LDA_INCLUDE='-I$(dovecot_incdir)'
+ LIBDOVECOT_STORAGE_INCLUDE='-I$(dovecot_incdir)'
fi
dovecot_pkglibexecdir='$(libexecdir)/dovecot'
@@ -155,9 +150,9 @@
AC_SUBST(LIBDOVECOT)
AC_SUBST(LIBDOVECOT_STORAGE)
-AC_SUBST(SIEVE_LDA_DOVECOT_INCLUDE)
-AC_SUBST(SIEVE_LIB_DOVECOT_INCLUDE)
-AC_SUBST(SIEVE_TOOL_DOVECOT_INCLUDE)
+AC_SUBST(LIBDOVECOT_INCLUDE)
+AC_SUBST(LIBDOVECOT_LDA_INCLUDE)
+AC_SUBST(LIBDOVECOT_STORAGE_INCLUDE)
AC_CONFIG_FILES([
Makefile
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve-tool/Makefile.am
--- a/src/lib-sieve-tool/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve-tool/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -2,7 +2,8 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib-sieve \
- $(SIEVE_TOOL_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE) \
+ $(LIBDOVECOT_STORAGE_INCLUDE)
libsieve_tool_la_SOURCES = \
sieve-tool.c \
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/Makefile.am
--- a/src/lib-sieve/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -3,7 +3,7 @@
dovecot_pkglib_LTLIBRARIES = libdovecot-sieve.la
AM_CPPFLAGS = \
- $(SIEVE_LIB_DOVECOT_INCLUDE) \
+ $(LIBDOVECOT_INCLUDE) \
-DMODULEDIR=\""$(moduledir)"\"
tests = \
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/plugins/body/Makefile.am
--- a/src/lib-sieve/plugins/body/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/plugins/body/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -2,7 +2,7 @@
AM_CPPFLAGS = \
-I../../ \
- $(SIEVE_LIB_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE)
tsts = \
tst-body.c
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/plugins/comparator-i-ascii-numeric/Makefile.am
--- a/src/lib-sieve/plugins/comparator-i-ascii-numeric/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/plugins/comparator-i-ascii-numeric/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -2,7 +2,7 @@
AM_CPPFLAGS = \
-I../../ \
- $(SIEVE_LIB_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE)
libsieve_ext_comparator_i_ascii_numeric_la_SOURCES = \
ext-cmp-i-ascii-numeric.c
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/plugins/copy/Makefile.am
--- a/src/lib-sieve/plugins/copy/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/plugins/copy/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -2,7 +2,7 @@
AM_CPPFLAGS = \
-I../../ \
- $(SIEVE_LIB_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE)
libsieve_ext_copy_la_SOURCES = \
ext-copy.c
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/plugins/date/Makefile.am
--- a/src/lib-sieve/plugins/date/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/plugins/date/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -2,7 +2,7 @@
AM_CPPFLAGS = \
-I../../ \
- $(SIEVE_LIB_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE)
tests = \
tst-date.c
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/plugins/enotify/Makefile.am
--- a/src/lib-sieve/plugins/enotify/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/plugins/enotify/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -3,7 +3,7 @@
AM_CPPFLAGS = \
-I../../ \
-I../variables \
- $(SIEVE_LIB_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE)
commands = \
cmd-notify.c
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/plugins/environment/Makefile.am
--- a/src/lib-sieve/plugins/environment/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/plugins/environment/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -2,7 +2,7 @@
AM_CPPFLAGS = \
-I../../ \
- $(SIEVE_LIB_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE)
tests = \
tst-environment.c
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/plugins/imap4flags/Makefile.am
--- a/src/lib-sieve/plugins/imap4flags/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/plugins/imap4flags/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -3,7 +3,7 @@
AM_CPPFLAGS = \
-I../../ \
-I../variables \
- $(SIEVE_LIB_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE)
commands = \
cmd-flag.c
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/plugins/include/Makefile.am
--- a/src/lib-sieve/plugins/include/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/plugins/include/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -3,7 +3,7 @@
AM_CPPFLAGS = \
-I../../ \
-I../variables \
- $(SIEVE_LIB_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE)
cmds = \
cmd-include.c \
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/plugins/mailbox/Makefile.am
--- a/src/lib-sieve/plugins/mailbox/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/plugins/mailbox/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -2,7 +2,7 @@
AM_CPPFLAGS = \
-I../../ \
- $(SIEVE_LIB_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE)
tags = \
tag-mailbox-create.c
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/plugins/notify/Makefile.am
--- a/src/lib-sieve/plugins/notify/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/plugins/notify/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -2,8 +2,7 @@
AM_CPPFLAGS = \
-I../../ \
- -I../variables \
- $(SIEVE_LIB_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE)
commands = \
cmd-notify.c \
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/plugins/regex/Makefile.am
--- a/src/lib-sieve/plugins/regex/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/plugins/regex/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -2,7 +2,7 @@
AM_CPPFLAGS = \
-I../../ \
- $(SIEVE_LIB_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE)
libsieve_ext_regex_la_SOURCES = \
mcht-regex.c \
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/plugins/relational/Makefile.am
--- a/src/lib-sieve/plugins/relational/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/plugins/relational/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -2,7 +2,7 @@
AM_CPPFLAGS = \
-I../../ \
- $(SIEVE_LIB_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE)
libsieve_ext_relational_la_SOURCES = \
ext-relational-common.c \
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/plugins/spamvirustest/Makefile.am
--- a/src/lib-sieve/plugins/spamvirustest/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/plugins/spamvirustest/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -2,7 +2,7 @@
AM_CPPFLAGS = \
-I../../ \
- $(SIEVE_LIB_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE)
tests = \
tst-spamvirustest.c
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/plugins/subaddress/Makefile.am
--- a/src/lib-sieve/plugins/subaddress/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/plugins/subaddress/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -2,7 +2,7 @@
AM_CPPFLAGS = \
-I../../ \
- $(SIEVE_LIB_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE)
libsieve_ext_subaddress_la_SOURCES = \
ext-subaddress.c
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/plugins/vacation/Makefile.am
--- a/src/lib-sieve/plugins/vacation/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/plugins/vacation/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -2,7 +2,7 @@
AM_CPPFLAGS = \
-I../../ \
- $(SIEVE_LIB_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE)
cmds = \
cmd-vacation.c
diff -r bae6e37d4164 -r 968a695f1a6a src/lib-sieve/plugins/variables/Makefile.am
--- a/src/lib-sieve/plugins/variables/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/lib-sieve/plugins/variables/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -2,7 +2,7 @@
AM_CPPFLAGS = \
-I../../ \
- $(SIEVE_LIB_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE)
cmds = \
cmd-set.c
diff -r bae6e37d4164 -r 968a695f1a6a src/plugins/lda-sieve/Makefile.am
--- a/src/plugins/lda-sieve/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/plugins/lda-sieve/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -1,6 +1,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib-sieve \
- $(SIEVE_LDA_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE) \
+ $(LIBDOVECOT_LDA_INCLUDE)
lib90_sieve_plugin_la_LDFLAGS = -module -avoid-version
diff -r bae6e37d4164 -r 968a695f1a6a src/sieve-tools/Makefile.am
--- a/src/sieve-tools/Makefile.am Sat Jan 02 13:56:11 2010 +0100
+++ b/src/sieve-tools/Makefile.am Sat Jan 02 16:16:24 2010 +0100
@@ -10,7 +10,8 @@
-I$(top_srcdir)/src/lib-sieve \
-I$(top_srcdir)/src/lib-sieve-tool \
-I./debug \
- $(SIEVE_TOOL_DOVECOT_INCLUDE)
+ $(LIBDOVECOT_INCLUDE) \
More information about the dovecot-cvs
mailing list