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

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 = \

src/lib-lda/Makefile.am

@@ -2,32 +2,25 @@ 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 = \
 	duplicate.h \
 	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

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
+

src/lib-lda/test-smtp-submit.c → 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>