lib-lda: Moved smtp-submit to lib-smtp.

diff --git a/src/Makefile.am b/src/Makefile.am
index 77735ff67300784290062ef287c9b6a04a20f4a5..c5a5fcc94a295ef4f4d79c6a7351ba7a167af0a4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,10 +18,10 @@ LIBDOVECOT_SUBDIRS = \
        lib-http \
        lib-fs \
        lib-mail \
+       lib-program-client \
        lib-smtp \
        lib-imap \
        lib-imap-storage \
-       lib-program-client \
        lib-oauth2
 
 SUBDIRS = \

diff --git a/src/lib-lda/Makefile.am b/src/lib-lda/Makefile.am
index 8b35e599b7c3d02bcb68bf77d183905f3fcf803e..fa7d25a0c06fd4c2ab2b1305046d512f10726697 100644 (file)
--- a/src/lib-lda/Makefile.am
+++ b/src/lib-lda/Makefile.am
@@ -2,24 +2,18 @@ noinst_LTLIBRARIES = liblda.la
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
-       -I$(top_srcdir)/src/lib-test \
        -I$(top_srcdir)/src/lib-settings \
-       -I$(top_srcdir)/src/lib-master \
-       -I$(top_srcdir)/src/lib-dns \
        -I$(top_srcdir)/src/lib-smtp \
        -I$(top_srcdir)/src/lib-index \
        -I$(top_srcdir)/src/lib-imap \
        -I$(top_srcdir)/src/lib-mail \
-       -I$(top_srcdir)/src/lib-storage \
-       -I$(top_srcdir)/src/lib-program-client \
-       -DTEST_BIN_DIR=\"$(abs_srcdir)/test-bin\"
+       -I$(top_srcdir)/src/lib-storage
 
 liblda_la_SOURCES = \
        duplicate.c \
        lda-settings.c \
        mail-deliver.c \
        mail-send.c \
-       smtp-submit.c \
        smtp-client.c
 
 headers = \
@@ -27,7 +21,6 @@ headers = \
        lda-settings.h \
        mail-deliver.h \
        mail-send.h \
-       smtp-submit.h \
        smtp-client.h
 
 pkginc_libdir=$(pkgincludedir)
@@ -41,45 +34,4 @@ libdovecot_lda_la_LIBADD = liblda.la $(deps)
 libdovecot_lda_la_DEPENDENCIES = liblda.la $(deps)
 libdovecot_lda_la_LDFLAGS = -export-dynamic
 
-test_programs =
 
-test_nocheck_programs = \
-       test-smtp-submit
-
-noinst_PROGRAMS = $(test_programs) $(test_nocheck_programs)
-
-test_libs = \
-       liblda.la \
-       ../lib-smtp/libsmtp.la \
-       ../lib-program-client/libprogram_client.la \
-       ../lib-dns/libdns.la \
-       ../lib-mail/libmail.la \
-       ../lib-master/libmaster.la \
-       ../lib-ssl-iostream/libssl_iostream.la \
-       ../lib-settings/libsettings.la \
-       ../lib-test/libtest.la \
-       ../lib/liblib.la \
-       $(MODULE_LIBS)
-
-test_deps = \
-       liblda.la \
-       ../lib-smtp/libsmtp.la \
-       ../lib-program-client/libprogram_client.la \
-       ../lib-dns/libdns.la \
-       ../lib-mail/libmail.la \
-       ../lib-master/libmaster.la \
-       ../lib-ssl-iostream/libssl_iostream.la \
-       ../lib-settings/libsettings.la \
-       ../lib-test/libtest.la \
-       ../lib/liblib.la
-
-test_smtp_submit_SOURCES = test-smtp-submit.c
-test_smtp_submit_LDFLAGS = -export-dynamic
-test_smtp_submit_LDADD = $(test_libs)
-test_smtp_submit_DEPENDENCIES = $(test_deps)
-
-check: check-am check-test
-check-test: all-am
-       for bin in $(test_programs); do \
-         if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
-       done

diff --git a/src/lib-smtp/Makefile.am b/src/lib-smtp/Makefile.am
index bbdf477cc5f3522f60ef4dd17dbfb24bbce5bcea..c70ab09706dc180d7560e47854a84ddbd661d5c7 100644 (file)
--- a/src/lib-smtp/Makefile.am
+++ b/src/lib-smtp/Makefile.am
@@ -2,13 +2,62 @@ noinst_LTLIBRARIES = libsmtp.la
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
-       -I$(top_srcdir)/src/lib-dns
+       -I$(top_srcdir)/src/lib-test \
+       -I$(top_srcdir)/src/lib-master \
+       -I$(top_srcdir)/src/lib-dns \
+       -I$(top_srcdir)/src/lib-program-client \
+       -I$(top_srcdir)/src/lib-mail \
+       -DTEST_BIN_DIR=\"$(abs_srcdir)/test-bin\"
 
 libsmtp_la_SOURCES = \
-       lmtp-client.c
+       lmtp-client.c \
+       smtp-submit.c
 
 headers = \
-       lmtp-client.h
+       lmtp-client.h \
+       smtp-submit.h
 
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)
+
+test_programs =
+
+test_nocheck_programs = \
+       test-smtp-submit
+
+noinst_PROGRAMS = $(test_programs) $(test_nocheck_programs)
+
+test_libs = \
+       libsmtp.la \
+       ../lib-program-client/libprogram_client.la \
+       ../lib-dns/libdns.la \
+       ../lib-mail/libmail.la \
+       ../lib-master/libmaster.la \
+       ../lib-ssl-iostream/libssl_iostream.la \
+       ../lib-settings/libsettings.la \
+       ../lib-test/libtest.la \
+       ../lib/liblib.la \
+       $(MODULE_LIBS)
+
+test_deps = \
+       libsmtp.la \
+       ../lib-program-client/libprogram_client.la \
+       ../lib-dns/libdns.la \
+       ../lib-mail/libmail.la \
+       ../lib-master/libmaster.la \
+       ../lib-ssl-iostream/libssl_iostream.la \
+       ../lib-settings/libsettings.la \
+       ../lib-test/libtest.la \
+       ../lib/liblib.la
+
+test_smtp_submit_SOURCES = test-smtp-submit.c
+test_smtp_submit_LDFLAGS = -export-dynamic
+test_smtp_submit_LDADD = $(test_libs)
+test_smtp_submit_DEPENDENCIES = $(test_deps)
+
+check: check-am check-test
+check-test: all-am
+       for bin in $(test_programs); do \
+         if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
+       done
+

diff --git a/src/lib-lda/smtp-submit.c b/src/lib-smtp/smtp-submit.c
similarity index 100%
rename from src/lib-lda/smtp-submit.c
rename to src/lib-smtp/smtp-submit.c

diff --git a/src/lib-lda/smtp-submit.h b/src/lib-smtp/smtp-submit.h
similarity index 100%
rename from src/lib-lda/smtp-submit.h
rename to src/lib-smtp/smtp-submit.h

diff --git a/src/lib-lda/test-bin/sendmail-exit-1.sh b/src/lib-smtp/test-bin/sendmail-exit-1.sh
similarity index 100%
rename from src/lib-lda/test-bin/sendmail-exit-1.sh
rename to src/lib-smtp/test-bin/sendmail-exit-1.sh

diff --git a/src/lib-lda/test-bin/sendmail-success.sh b/src/lib-smtp/test-bin/sendmail-success.sh
similarity index 100%
rename from src/lib-lda/test-bin/sendmail-success.sh
rename to src/lib-smtp/test-bin/sendmail-success.sh

diff --git a/src/lib-lda/test-smtp-submit.c b/src/lib-smtp/test-smtp-submit.c
similarity index 99%
rename from src/lib-lda/test-smtp-submit.c
rename to src/lib-smtp/test-smtp-submit.c
index 6a683af7199140cfe9fd78ff1778815869106e2a..e96ada704b1260b43fe265b65ee6547e5b1cd2c1 100644 (file)
--- a/src/lib-lda/test-smtp-submit.c
+++ b/src/lib-smtp/test-smtp-submit.c
@@ -15,7 +15,6 @@
 #include "master-service.h"
 #include "istream-dot.h"
 #include "test-common.h"
-#include "lda-settings.h"
 #include "smtp-submit.h"
 
 #include <sys/types.h>