dovecot-2.0-pigeonhole: First changes towards making `make distc...
pigeonhole at rename-it.nl
pigeonhole at rename-it.nl
Sat Jul 17 20:57:39 EEST 2010
details: http://hg.rename-it.nl/dovecot-2.0-pigeonhole/rev/c37eec591842
changeset: 1337:c37eec591842
user: Stephan Bosch <stephan at rename-it.nl>
date: Sat Jul 17 19:57:25 2010 +0200
description:
First changes towards making `make distcheck' work.
diffstat:
Makefile.am | 6 ++-
configure.in | 2 +-
src/lib-sieve/Makefile.am | 33 ++++++++--------
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 | 4 +-
src/lib-sieve/plugins/enotify/mailto/Makefile.am | 4 +-
src/lib-sieve/plugins/environment/Makefile.am | 2 +-
src/lib-sieve/plugins/imap4flags/Makefile.am | 4 +-
src/lib-sieve/plugins/include/Makefile.am | 4 +-
src/lib-sieve/plugins/mailbox/Makefile.am | 2 +-
src/lib-sieve/plugins/notify/Makefile.am | 2 +-
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/managesieve-login/Makefile.am | 2 +-
src/managesieve/Makefile.am | 6 +-
src/plugins/lda-sieve/Makefile.am | 2 +-
src/sieve-tools/Makefile.am | 8 ++--
src/testsuite/Makefile.am | 4 +-
25 files changed, 54 insertions(+), 51 deletions(-)
diffs (truncated from 368 to 300 lines):
diff -r fdec4e5304e2 -r c37eec591842 Makefile.am
--- a/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -24,7 +24,7 @@
# Testsuite tests
-TESTSUITE_BIN = $(top_srcdir)/src/testsuite/testsuite
+TESTSUITE_BIN = $(top_builddir)/src/testsuite/testsuite
if TESTSUITE_VALGRIND
TEST_BIN = valgrind -q --error-exitcode=1 --show-reachable=yes --leak-check=full $(TESTSUITE_BIN)
@@ -128,8 +128,10 @@
$(test_unfinished)
$(test_cases):
- @$(TEST_BIN) $@
+ @$(TEST_BIN) $(top_srcdir)/$@
.PHONY: $(test_cases)
test: $(test_cases)
+
+check: check-am test all-am
diff -r fdec4e5304e2 -r c37eec591842 configure.in
--- a/configure.in Sat Jul 17 12:11:58 2010 +0200
+++ b/configure.in Sat Jul 17 19:57:25 2010 +0200
@@ -31,7 +31,7 @@
LIBS="$DOVECOT_LIBS"
AC_SUBST(LIBDOVECOT_INCLUDE)
-# Defome Sieve documentation install dir
+# Define Sieve documentation install dir
#
sieve_docdir='${dovecot_docdir}/sieve'
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/Makefile.am
--- a/src/lib-sieve/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -45,23 +45,24 @@
endif
# These are not actual plugins just yet...
+extdir = $(builddir)/plugins
plugins = \
- ./plugins/vacation/libsieve_ext_vacation.la \
- ./plugins/subaddress/libsieve_ext_subaddress.la \
- ./plugins/comparator-i-ascii-numeric/libsieve_ext_comparator-i-ascii-numeric.la \
- ./plugins/relational/libsieve_ext_relational.la \
- ./plugins/regex/libsieve_ext_regex.la \
- ./plugins/copy/libsieve_ext_copy.la \
- ./plugins/imap4flags/libsieve_ext_imap4flags.la \
- ./plugins/include/libsieve_ext_include.la \
- ./plugins/body/libsieve_ext_body.la \
- ./plugins/variables/libsieve_ext_variables.la \
- ./plugins/enotify/libsieve_ext_enotify.la \
- ./plugins/notify/libsieve_ext_notify.la \
- ./plugins/environment/libsieve_ext_environment.la \
- ./plugins/mailbox/libsieve_ext_mailbox.la \
- ./plugins/date/libsieve_ext_date.la \
- ./plugins/spamvirustest/libsieve_ext_spamvirustest.la \
+ $(extdir)/vacation/libsieve_ext_vacation.la \
+ $(extdir)/subaddress/libsieve_ext_subaddress.la \
+ $(extdir)/comparator-i-ascii-numeric/libsieve_ext_comparator-i-ascii-numeric.la \
+ $(extdir)/relational/libsieve_ext_relational.la \
+ $(extdir)/regex/libsieve_ext_regex.la \
+ $(extdir)/copy/libsieve_ext_copy.la \
+ $(extdir)/imap4flags/libsieve_ext_imap4flags.la \
+ $(extdir)/include/libsieve_ext_include.la \
+ $(extdir)/body/libsieve_ext_body.la \
+ $(extdir)/variables/libsieve_ext_variables.la \
+ $(extdir)/enotify/libsieve_ext_enotify.la \
+ $(extdir)/notify/libsieve_ext_notify.la \
+ $(extdir)/environment/libsieve_ext_environment.la \
+ $(extdir)/mailbox/libsieve_ext_mailbox.la \
+ $(extdir)/date/libsieve_ext_date.la \
+ $(extdir)/spamvirustest/libsieve_ext_spamvirustest.la \
$(unfinished_plugins)
libdovecot_sieve_la_DEPENDENCIES = $(plugins)
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/body/Makefile.am
--- a/src/lib-sieve/plugins/body/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/body/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libsieve_ext_body.la
AM_CPPFLAGS = \
- -I../../ \
+ -I$(srcdir)/../.. \
$(LIBDOVECOT_INCLUDE)
tsts = \
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/comparator-i-ascii-numeric/Makefile.am
--- a/src/lib-sieve/plugins/comparator-i-ascii-numeric/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/comparator-i-ascii-numeric/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libsieve_ext_comparator-i-ascii-numeric.la
AM_CPPFLAGS = \
- -I../../ \
+ -I$(srcdir)/../.. \
$(LIBDOVECOT_INCLUDE)
libsieve_ext_comparator_i_ascii_numeric_la_SOURCES = \
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/copy/Makefile.am
--- a/src/lib-sieve/plugins/copy/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/copy/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libsieve_ext_copy.la
AM_CPPFLAGS = \
- -I../../ \
+ -I$(srcdir)/../.. \
$(LIBDOVECOT_INCLUDE)
libsieve_ext_copy_la_SOURCES = \
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/date/Makefile.am
--- a/src/lib-sieve/plugins/date/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/date/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libsieve_ext_date.la
AM_CPPFLAGS = \
- -I../../ \
+ -I$(srcdir)/../.. \
$(LIBDOVECOT_INCLUDE)
tests = \
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/enotify/Makefile.am
--- a/src/lib-sieve/plugins/enotify/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/enotify/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -3,8 +3,8 @@
noinst_LTLIBRARIES = libsieve_ext_enotify.la
AM_CPPFLAGS = \
- -I../../ \
- -I../variables \
+ -I$(srcdir)/../.. \
+ -I$(srcdir)/../variables \
$(LIBDOVECOT_INCLUDE)
commands = \
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/enotify/mailto/Makefile.am
--- a/src/lib-sieve/plugins/enotify/mailto/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/enotify/mailto/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -1,8 +1,8 @@
noinst_LTLIBRARIES = libsieve_ext_enotify_mailto.la
AM_CPPFLAGS = \
- -I../ \
- -I../../../ \
+ -I$(srcdir)/.. \
+ -I$(srcdir)/../../.. \
$(LIBDOVECOT_INCLUDE)
libsieve_ext_enotify_mailto_la_SOURCES = \
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/environment/Makefile.am
--- a/src/lib-sieve/plugins/environment/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/environment/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libsieve_ext_environment.la
AM_CPPFLAGS = \
- -I../../ \
+ -I$(srcdir)/../.. \
$(LIBDOVECOT_INCLUDE)
tests = \
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/imap4flags/Makefile.am
--- a/src/lib-sieve/plugins/imap4flags/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/imap4flags/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -1,8 +1,8 @@
noinst_LTLIBRARIES = libsieve_ext_imap4flags.la
AM_CPPFLAGS = \
- -I../../ \
- -I../variables \
+ -I$(srcdir)/../.. \
+ -I$(srcdir)/../variables \
$(LIBDOVECOT_INCLUDE)
commands = \
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/include/Makefile.am
--- a/src/lib-sieve/plugins/include/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/include/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -1,8 +1,8 @@
noinst_LTLIBRARIES = libsieve_ext_include.la
AM_CPPFLAGS = \
- -I../../ \
- -I../variables \
+ -I$(srcdir)/../.. \
+ -I$(srcdir)/../variables \
$(LIBDOVECOT_INCLUDE)
cmds = \
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/mailbox/Makefile.am
--- a/src/lib-sieve/plugins/mailbox/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/mailbox/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libsieve_ext_mailbox.la
AM_CPPFLAGS = \
- -I../../ \
+ -I$(srcdir)/../.. \
$(LIBDOVECOT_INCLUDE)
tags = \
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/notify/Makefile.am
--- a/src/lib-sieve/plugins/notify/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/notify/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libsieve_ext_notify.la
AM_CPPFLAGS = \
- -I../../ \
+ -I$(srcdir)/../.. \
$(LIBDOVECOT_INCLUDE)
commands = \
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/regex/Makefile.am
--- a/src/lib-sieve/plugins/regex/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/regex/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libsieve_ext_regex.la
AM_CPPFLAGS = \
- -I../../ \
+ -I$(srcdir)/../.. \
$(LIBDOVECOT_INCLUDE)
libsieve_ext_regex_la_SOURCES = \
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/relational/Makefile.am
--- a/src/lib-sieve/plugins/relational/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/relational/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libsieve_ext_relational.la
AM_CPPFLAGS = \
- -I../../ \
+ -I$(srcdir)/../.. \
$(LIBDOVECOT_INCLUDE)
libsieve_ext_relational_la_SOURCES = \
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/spamvirustest/Makefile.am
--- a/src/lib-sieve/plugins/spamvirustest/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/spamvirustest/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libsieve_ext_spamvirustest.la
AM_CPPFLAGS = \
- -I../../ \
+ -I$(srcdir)/../.. \
$(LIBDOVECOT_INCLUDE)
tests = \
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/subaddress/Makefile.am
--- a/src/lib-sieve/plugins/subaddress/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/subaddress/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libsieve_ext_subaddress.la
AM_CPPFLAGS = \
- -I../../ \
+ -I$(srcdir)/../../ \
$(LIBDOVECOT_INCLUDE)
libsieve_ext_subaddress_la_SOURCES = \
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/vacation/Makefile.am
--- a/src/lib-sieve/plugins/vacation/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/vacation/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libsieve_ext_vacation.la
AM_CPPFLAGS = \
- -I../../ \
+ -I$(srcdir)/../../ \
$(LIBDOVECOT_INCLUDE)
cmds = \
diff -r fdec4e5304e2 -r c37eec591842 src/lib-sieve/plugins/variables/Makefile.am
--- a/src/lib-sieve/plugins/variables/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/lib-sieve/plugins/variables/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libsieve_ext_variables.la
AM_CPPFLAGS = \
- -I../../ \
+ -I$(srcdir)/../.. \
$(LIBDOVECOT_INCLUDE)
cmds = \
diff -r fdec4e5304e2 -r c37eec591842 src/managesieve-login/Makefile.am
--- a/src/managesieve-login/Makefile.am Sat Jul 17 12:11:58 2010 +0200
+++ b/src/managesieve-login/Makefile.am Sat Jul 17 19:57:25 2010 +0200
@@ -22,7 +22,7 @@
$(AM_CFLAGS) $(LIBDOVECOT_CONFIG_INCLUDE) -DPKG_LIBEXECDIR=\""$(dovecot_pkglibexecdir)"\"
libs = \
- $(top_srcdir)/src/lib-managesieve/libmanagesieve.a
More information about the dovecot-cvs
mailing list