From: Timo Sirainen Date: Tue, 7 Apr 2009 18:32:43 +0000 (-0400) Subject: Get rid of imap/, pop3/, lda/ and sql/ module subdirs. It's all in lib/dovecot/ now. X-Git-Tag: 2.0.alpha1~1016 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a22c03355b9c4c8e1655250e216a4ce66d49de7c;p=thirdparty%2Fdovecot%2Fcore.git Get rid of imap/, pop3/, lda/ and sql/ module subdirs. It's all in lib/dovecot/ now. --HG-- branch : HEAD --- diff --git a/src/deliver/deliver-settings.c b/src/deliver/deliver-settings.c index bf995802c0..c19783077c 100644 --- a/src/deliver/deliver-settings.c +++ b/src/deliver/deliver-settings.c @@ -57,7 +57,7 @@ static struct deliver_settings deliver_default_settings = { 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 --git a/src/imap/imap-settings.c b/src/imap/imap-settings.c index 82270840db..95aa6e8ba9 100644 --- a/src/imap/imap-settings.c +++ b/src/imap/imap-settings.c @@ -48,7 +48,7 @@ static struct imap_settings imap_default_settings = { 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 --git a/src/lib-sql/Makefile.am b/src/lib-sql/Makefile.am index c1178d285b..74996324a1 100644 --- a/src/lib-sql/Makefile.am +++ b/src/lib-sql/Makefile.am @@ -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 --git a/src/plugins/acl/Makefile.am b/src/plugins/acl/Makefile.am index f60da78612..63083df0da 100644 --- a/src/plugins/acl/Makefile.am +++ b/src/plugins/acl/Makefile.am @@ -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 --git a/src/plugins/autocreate/Makefile.am b/src/plugins/autocreate/Makefile.am index 13f537045c..d6bb2b85c9 100644 --- a/src/plugins/autocreate/Makefile.am +++ b/src/plugins/autocreate/Makefile.am @@ -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 --git a/src/plugins/convert/Makefile.am b/src/plugins/convert/Makefile.am index a2a2b18283..a8296266c0 100644 --- a/src/plugins/convert/Makefile.am +++ b/src/plugins/convert/Makefile.am @@ -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 --git a/src/plugins/expire/Makefile.am b/src/plugins/expire/Makefile.am index 3b5dad58d8..4a4e7a0c60 100644 --- a/src/plugins/expire/Makefile.am +++ b/src/plugins/expire/Makefile.am @@ -41,12 +41,3 @@ 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 --git a/src/plugins/fts-lucene/Makefile.am b/src/plugins/fts-lucene/Makefile.am index 399fc2db2d..42ee3c1e18 100644 --- a/src/plugins/fts-lucene/Makefile.am +++ b/src/plugins/fts-lucene/Makefile.am @@ -22,10 +22,3 @@ lib21_fts_lucene_plugin_la_SOURCES = \ 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 --git a/src/plugins/fts-solr/Makefile.am b/src/plugins/fts-solr/Makefile.am index 9cedc42c05..cc3d631903 100644 --- a/src/plugins/fts-solr/Makefile.am +++ b/src/plugins/fts-solr/Makefile.am @@ -22,10 +22,3 @@ lib21_fts_solr_plugin_la_SOURCES = \ 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 --git a/src/plugins/fts-squat/Makefile.am b/src/plugins/fts-squat/Makefile.am index 963de9fac6..1054dcb49f 100644 --- a/src/plugins/fts-squat/Makefile.am +++ b/src/plugins/fts-squat/Makefile.am @@ -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 --git a/src/plugins/fts/Makefile.am b/src/plugins/fts/Makefile.am index c0859800a5..98c92de00f 100644 --- a/src/plugins/fts/Makefile.am +++ b/src/plugins/fts/Makefile.am @@ -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 --git a/src/plugins/imap-acl/Makefile.am b/src/plugins/imap-acl/Makefile.am index 76859e664b..07071d443d 100644 --- a/src/plugins/imap-acl/Makefile.am +++ b/src/plugins/imap-acl/Makefile.am @@ -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 --git a/src/plugins/imap-quota/Makefile.am b/src/plugins/imap-quota/Makefile.am index 15272d12e1..c9302bfa75 100644 --- a/src/plugins/imap-quota/Makefile.am +++ b/src/plugins/imap-quota/Makefile.am @@ -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 --git a/src/plugins/lazy-expunge/Makefile.am b/src/plugins/lazy-expunge/Makefile.am index 695af464eb..83f8437d6f 100644 --- a/src/plugins/lazy-expunge/Makefile.am +++ b/src/plugins/lazy-expunge/Makefile.am @@ -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 --git a/src/plugins/listescape/Makefile.am b/src/plugins/listescape/Makefile.am index bcd28e2834..8d6c03df79 100644 --- a/src/plugins/listescape/Makefile.am +++ b/src/plugins/listescape/Makefile.am @@ -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 --git a/src/plugins/mail-log/Makefile.am b/src/plugins/mail-log/Makefile.am index f4a46b03ba..2a586b5e21 100644 --- a/src/plugins/mail-log/Makefile.am +++ b/src/plugins/mail-log/Makefile.am @@ -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 --git a/src/plugins/mbox-snarf/Makefile.am b/src/plugins/mbox-snarf/Makefile.am index 001b728aae..5d2ba8f027 100644 --- a/src/plugins/mbox-snarf/Makefile.am +++ b/src/plugins/mbox-snarf/Makefile.am @@ -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 --git a/src/plugins/quota/Makefile.am b/src/plugins/quota/Makefile.am index acd0df0d8b..4c8c6d94a0 100644 --- a/src/plugins/quota/Makefile.am +++ b/src/plugins/quota/Makefile.am @@ -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 --git a/src/plugins/trash/Makefile.am b/src/plugins/trash/Makefile.am index 21d0257a8f..8b18ab71ef 100644 --- a/src/plugins/trash/Makefile.am +++ b/src/plugins/trash/Makefile.am @@ -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 --git a/src/plugins/virtual/Makefile.am b/src/plugins/virtual/Makefile.am index 94d58b3b21..a5d905e7c9 100644 --- a/src/plugins/virtual/Makefile.am +++ b/src/plugins/virtual/Makefile.am @@ -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 --git a/src/plugins/zlib/Makefile.am b/src/plugins/zlib/Makefile.am index 3bb13afe4d..2e5f4c19ed 100644 --- a/src/plugins/zlib/Makefile.am +++ b/src/plugins/zlib/Makefile.am @@ -28,10 +28,3 @@ lib20_zlib_plugin_la_SOURCES = \ noinst_HEADERS = \ istream-zlib.h \ zlib-plugin.h - -install-exec-local: - for d in imap pop3; do \ - $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \ - rm -f $(DESTDIR)$(moduledir)/$$d/lib20_zlib_plugin$(MODULE_SUFFIX); \ - $(LN_S) ../lib20_zlib_plugin$(MODULE_SUFFIX) $(DESTDIR)$(moduledir)/$$d; \ - done diff --git a/src/pop3/pop3-settings.c b/src/pop3/pop3-settings.c index 06a31dc01d..c5ac88bd57 100644 --- a/src/pop3/pop3-settings.c +++ b/src/pop3/pop3-settings.c @@ -49,7 +49,7 @@ static struct pop3_settings pop3_default_settings = { MEMBER(verbose_proctitle) FALSE, MEMBER(mail_plugins) "", - MEMBER(mail_plugin_dir) MODULEDIR"/pop3", + MEMBER(mail_plugin_dir) MODULEDIR, MEMBER(pop3_no_flag_updates) FALSE, MEMBER(pop3_enable_last) FALSE,