dovecot-1.3: Get rid of imap/, pop3/, lda/ and sql/ module subdi...
dovecot at dovecot.org
dovecot at dovecot.org
Tue Apr 7 23:41:31 EEST 2009
details: http://hg.dovecot.org/dovecot-1.3/rev/d981b4b50cb7
changeset: 9036:d981b4b50cb7
user: Timo Sirainen <tss at iki.fi>
date: Tue Apr 07 14:32:43 2009 -0400
description:
Get rid of imap/, pop3/, lda/ and sql/ module subdirs. It's all in lib/dovecot/ now.
diffstat:
22 files changed, 7 insertions(+), 126 deletions(-)
src/deliver/deliver-settings.c | 2 +-
src/imap/imap-settings.c | 2 +-
src/lib-sql/Makefile.am | 4 ++--
src/plugins/acl/Makefile.am | 7 -------
src/plugins/autocreate/Makefile.am | 8 --------
src/plugins/convert/Makefile.am | 7 -------
src/plugins/expire/Makefile.am | 9 ---------
src/plugins/fts-lucene/Makefile.am | 7 -------
src/plugins/fts-solr/Makefile.am | 7 -------
src/plugins/fts-squat/Makefile.am | 7 -------
src/plugins/fts/Makefile.am | 7 -------
src/plugins/imap-acl/Makefile.am | 2 +-
src/plugins/imap-quota/Makefile.am | 2 +-
src/plugins/lazy-expunge/Makefile.am | 8 --------
src/plugins/listescape/Makefile.am | 8 --------
src/plugins/mail-log/Makefile.am | 8 --------
src/plugins/mbox-snarf/Makefile.am | 7 -------
src/plugins/quota/Makefile.am | 7 -------
src/plugins/trash/Makefile.am | 8 --------
src/plugins/virtual/Makefile.am | 7 -------
src/plugins/zlib/Makefile.am | 7 -------
src/pop3/pop3-settings.c | 2 +-
diffs (truncated from 315 to 300 lines):
diff -r 17f06144e534 -r d981b4b50cb7 src/deliver/deliver-settings.c
--- a/src/deliver/deliver-settings.c Tue Apr 07 13:01:12 2009 -0400
+++ b/src/deliver/deliver-settings.c Tue Apr 07 14:32:43 2009 -0400
@@ -57,7 +57,7 @@ static struct deliver_settings deliver_d
MEMBER(version_ignore) FALSE,
MEMBER(mail_plugins) "",
- MEMBER(mail_plugin_dir) MODULEDIR"/lda",
+ MEMBER(mail_plugin_dir) MODULEDIR,
MEMBER(mail_uid) "",
MEMBER(mail_gid) "",
diff -r 17f06144e534 -r d981b4b50cb7 src/imap/imap-settings.c
--- a/src/imap/imap-settings.c Tue Apr 07 13:01:12 2009 -0400
+++ b/src/imap/imap-settings.c Tue Apr 07 14:32:43 2009 -0400
@@ -48,7 +48,7 @@ static struct imap_settings imap_default
MEMBER(verbose_proctitle) FALSE,
MEMBER(mail_plugins) "",
- MEMBER(mail_plugin_dir) MODULEDIR"/imap",
+ MEMBER(mail_plugin_dir) MODULEDIR,
/* RFC-2683 recommends at least 8000 bytes. Some clients however don't
break large message sets to multiple commands, so we're pretty
diff -r 17f06144e534 -r d981b4b50cb7 src/lib-sql/Makefile.am
--- a/src/lib-sql/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/lib-sql/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -21,7 +21,7 @@ sql_module_LTLIBRARIES = \
$(PGSQL_LIB) \
$(SQLITE_LIB)
-sql_moduledir = $(moduledir)/sql
+sql_moduledir = $(moduledir)
endif
sql_drivers = @sql_drivers@
@@ -104,7 +104,7 @@ install-exec-local:
$(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
for driver in $(SQL_DRIVER_PLUGINS); do \
rm -f $(DESTDIR)$(moduledir)/$$d/libdriver_$$driver.so; \
- $(LN_S) ../sql/libdriver_$$driver.so $(DESTDIR)$(moduledir)/$$d; \
+ $(LN_S) ../libdriver_$$driver.so $(DESTDIR)$(moduledir)/$$d; \
done; \
done
endif
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/acl/Makefile.am
--- a/src/plugins/acl/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/acl/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -33,10 +33,3 @@ noinst_HEADERS = \
acl-plugin.h \
acl-shared-storage.h \
acl-storage.h
-
-install-exec-local:
- for d in imap lda; do \
- $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
- rm -f $(DESTDIR)$(moduledir)/$$d/lib01_acl_plugin$(MODULE_SUFFIX); \
- $(LN_S) ../lib01_acl_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
- done
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/autocreate/Makefile.am
--- a/src/plugins/autocreate/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/autocreate/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -14,11 +14,3 @@ lib20_autocreate_plugin_la_SOURCES = \
noinst_HEADERS = \
autocreate-plugin.h
-
-install-exec-local:
- for d in imap pop3 lda; do \
- $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
- rm -f $(DESTDIR)$(moduledir)/$$d/lib20_autocreate_plugin$(MODULE_SUFFIX); \
- $(LN_S) ../lib20_autocreate_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
- done
-
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/convert/Makefile.am
--- a/src/plugins/convert/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/convert/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -41,10 +41,3 @@ convert_tool_LDADD = \
$(libs)
convert_tool_DEPENDENCIES = $(libs) $(common_objects)
-
-install-exec-local:
- for d in imap pop3 lda; do \
- $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
- rm -f $(DESTDIR)$(moduledir)/$$d/lib20_convert_plugin$(MODULE_SUFFIX); \
- $(LN_S) ../lib20_convert_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
- done
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/expire/Makefile.am
--- a/src/plugins/expire/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/expire/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -41,12 +41,3 @@ expire_tool_LDADD = $(libs)
expire_tool_LDADD = $(libs)
expire_tool_DEPENDENCIES = $(libs)
-
-install-exec-local:
- $(mkdir_p) $(DESTDIR)$(moduledir)/imap \
- $(DESTDIR)$(moduledir)/pop3 \
- $(DESTDIR)$(moduledir)/lda
- for d in imap pop3 lda; do \
- rm -f $(DESTDIR)$(moduledir)/$$d/lib20_expire_plugin$(MODULE_SUFFIX); \
- $(LN_S) ../lib20_expire_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
- done
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/fts-lucene/Makefile.am
--- a/src/plugins/fts-lucene/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/fts-lucene/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -22,10 +22,3 @@ noinst_HEADERS = \
noinst_HEADERS = \
fts-lucene-plugin.h \
lucene-wrapper.h
-
-install-exec-local:
- for d in imap pop3 lda; do \
- $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
- rm -f $(DESTDIR)$(moduledir)/$$d/lib21_fts_lucene_plugin$(MODULE_SUFFIX); \
- $(LN_S) ../lib21_fts_lucene_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
- done
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/fts-solr/Makefile.am
--- a/src/plugins/fts-solr/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/fts-solr/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -22,10 +22,3 @@ noinst_HEADERS = \
noinst_HEADERS = \
fts-solr-plugin.h \
solr-connection.h
-
-install-exec-local:
- for d in imap pop3 lda; do \
- $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
- rm -f $(DESTDIR)$(moduledir)/$$d/lib21_fts_solr_plugin$(MODULE_SUFFIX); \
- $(LN_S) ../lib21_fts_solr_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
- done
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/fts-squat/Makefile.am
--- a/src/plugins/fts-squat/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/fts-squat/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -40,10 +40,3 @@ squat_test_LDADD = \
$(libs)
squat_test_DEPENDENCIES = $(libs) $(common_objects)
-
-install-exec-local:
- for d in imap pop3 lda; do \
- $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
- rm -f $(DESTDIR)$(moduledir)/$$d/lib21_fts_squat_plugin$(MODULE_SUFFIX); \
- $(LN_S) ../lib21_fts_squat_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
- done
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/fts/Makefile.am
--- a/src/plugins/fts/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/fts/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -21,10 +21,3 @@ noinst_HEADERS = \
fts-api-private.h \
fts-plugin.h \
fts-storage.h
-
-install-exec-local:
- for d in imap pop3 lda; do \
- $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
- rm -f $(DESTDIR)$(moduledir)/$$d/lib20_fts_plugin$(MODULE_SUFFIX); \
- $(LN_S) ../lib20_fts_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
- done
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/imap-acl/Makefile.am
--- a/src/plugins/imap-acl/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/imap-acl/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/imap \
-I$(top_srcdir)/src/plugins/acl
-imap_moduledir = $(moduledir)/imap
+imap_moduledir = $(moduledir)
lib02_imap_acl_plugin_la_LDFLAGS = -module -avoid-version
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/imap-quota/Makefile.am
--- a/src/plugins/imap-quota/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/imap-quota/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/imap \
-I$(top_srcdir)/src/plugins/quota
-imap_moduledir = $(moduledir)/imap
+imap_moduledir = $(moduledir)
lib11_imap_quota_plugin_la_LDFLAGS = -module -avoid-version
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/lazy-expunge/Makefile.am
--- a/src/plugins/lazy-expunge/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/lazy-expunge/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -18,11 +18,3 @@ lib02_lazy_expunge_plugin_la_SOURCES = \
noinst_HEADERS = \
lazy-expunge-plugin.h
-
-install-exec-local:
- for d in imap pop3; do \
- $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
- rm -f $(DESTDIR)$(moduledir)/$$d/lib02_lazy_expunge_plugin$(MODULE_SUFFIX); \
- $(LN_S) ../lib02_lazy_expunge_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
- done
-
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/listescape/Makefile.am
--- a/src/plugins/listescape/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/listescape/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -15,11 +15,3 @@ lib20_listescape_plugin_la_SOURCES = \
noinst_HEADERS = \
listescape-plugin.h
-
-install-exec-local:
- for d in imap pop3 lda; do \
- $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
- rm -f $(DESTDIR)$(moduledir)/$$d/lib20_listescape_plugin$(MODULE_SUFFIX); \
- $(LN_S) ../lib20_listescape_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
- done
-
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/mail-log/Makefile.am
--- a/src/plugins/mail-log/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/mail-log/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -17,11 +17,3 @@ lib20_mail_log_plugin_la_SOURCES = \
noinst_HEADERS = \
mail-log-plugin.h
-
-install-exec-local:
- for d in imap pop3 lda; do \
- $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
- rm -f $(DESTDIR)$(moduledir)/$$d/lib20_mail_log_plugin$(MODULE_SUFFIX); \
- $(LN_S) ../lib20_mail_log_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
- done
-
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/mbox-snarf/Makefile.am
--- a/src/plugins/mbox-snarf/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/mbox-snarf/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -14,10 +14,3 @@ lib20_mbox_snarf_plugin_la_SOURCES = \
noinst_HEADERS = \
mbox-snarf-plugin.h
-
-install-exec-local:
- for d in imap pop3; do \
- $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
- rm -f $(DESTDIR)$(moduledir)/$$d/lib20_mbox_snarf_plugin$(MODULE_SUFFIX); \
- $(LN_S) ../lib20_mbox_snarf_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
- done
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/quota/Makefile.am
--- a/src/plugins/quota/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/quota/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -57,13 +57,6 @@ noinst_HEADERS = \
quota-plugin.h \
quota-private.h
-install-exec-local:
- for d in imap pop3 lda; do \
- $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
- rm -f $(DESTDIR)$(moduledir)/$$d/lib10_quota_plugin$(MODULE_SUFFIX); \
- $(LN_S) ../lib10_quota_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
- done
-
EXTRA_DIST = rquota.x
DISTFILES = $(DIST_COMMON) $(quota_dist_sources) $(TEXINFOS) $(EXTRA_DIST)
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/trash/Makefile.am
--- a/src/plugins/trash/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/trash/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -15,11 +15,3 @@ lib11_trash_plugin_la_SOURCES = \
noinst_HEADERS = \
trash-plugin.h
-
-install-exec-local:
- for d in imap lda; do \
- $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
- rm -f $(DESTDIR)$(moduledir)/$$d/lib11_trash_plugin$(MODULE_SUFFIX); \
- $(LN_S) ../lib11_trash_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \
- done
-
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/virtual/Makefile.am
--- a/src/plugins/virtual/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/virtual/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -25,10 +25,3 @@ noinst_HEADERS = \
virtual-plugin.h \
virtual-storage.h \
virtual-transaction.h
-
-install-exec-local:
- for d in imap pop3 lda; do \
- $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
- rm -f $(DESTDIR)$(moduledir)/$$d/lib20_virtual_plugin.so; \
- $(LN_S) ../lib20_virtual_plugin.so $(DESTDIR)$(moduledir)/$$d; \
- done
diff -r 17f06144e534 -r d981b4b50cb7 src/plugins/zlib/Makefile.am
--- a/src/plugins/zlib/Makefile.am Tue Apr 07 13:01:12 2009 -0400
+++ b/src/plugins/zlib/Makefile.am Tue Apr 07 14:32:43 2009 -0400
@@ -28,10 +28,3 @@ noinst_HEADERS = \
noinst_HEADERS = \
istream-zlib.h \
zlib-plugin.h
-
-install-exec-local:
- for d in imap pop3; do \
- $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
More information about the dovecot-cvs
mailing list