global: Add and use LIBDOVECOT_TEST_LIBS

diff --git a/configure.ac b/configure.ac
index b5de58e106f4a20458ade86b2c5ef93b8b9abbaa..15d95953f6e3551b243daf55e9a926b8384a909f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -644,7 +644,10 @@ LIBDOVECOT_LIBLANG='$(top_builddir)/src/lib-language/libdovecot-language.la'
 LIBDOVECOT_OPENSSL='$(top_builddir)/src/lib-ssl-iostream/libssl_iostream_openssl.la'
 LIBDOVECOT_OPENSSL_DEPS="$LIBDOVECOT_OPENSSL"
 
+LIBDOVECOT_TEST_LIBS="\$(LIBPCRE_LIBS) \$(ZLIB_LIBS) \$(MODULE_LIBS) \$(DLLIB) -lm"
+
 AC_SUBST(LIBDOVECOT)
+AC_SUBST(LIBDOVECOTTEST_LIBS)
 AC_SUBST(LIBDOVECOT_LA_LIBS)
 AC_SUBST(LIBDOVECOT_DEPS)
 AC_SUBST(LIBDOVECOT_STORAGE)

diff --git a/src/lib-auth-client/Makefile.am b/src/lib-auth-client/Makefile.am
index 76f09e47e59d9a4d6bae560220475691753dffdc..5881b08045c7b62e68659f5f0f3a99b227d65239 100644 (file)
--- a/src/lib-auth-client/Makefile.am
+++ b/src/lib-auth-client/Makefile.am
@@ -44,7 +44,7 @@ test_libs = \
        ../lib-regex/libdregex.la \
        ../lib-test/libtest.la \
        ../lib/liblib.la \
-       $(MODULE_LIBS)
+       $(LIBDOVECOT_TEST_LIBS)
 
 test_deps = \
        $(noinst_LTLIBRARIES) \

diff --git a/src/lib-auth/Makefile.am b/src/lib-auth/Makefile.am
index 9f52e7e96bb22b3aa907a66c3c4ecc91aeb187a3..3a26e873dedf3ef11bde1c377e75e54b95c4a317 100644 (file)
--- a/src/lib-auth/Makefile.am
+++ b/src/lib-auth/Makefile.am
@@ -62,7 +62,7 @@ test_libs = \
         ../lib-otp/libotp.la \
        ../lib-test/libtest.la \
        ../lib/liblib.la \
-       $(MODULE_LIBS)
+       $(LIBDOVECOT_TEST_LIBS)
 
 test_deps = \
        $(noinst_LTLIBRARIES) \

diff --git a/src/lib-charset/Makefile.am b/src/lib-charset/Makefile.am
index eec2a189b456c66f39fad2c64859e3d79fe540ea..2c265dc028636c82247ac5253f48a8a93fcd7625 100644 (file)
--- a/src/lib-charset/Makefile.am
+++ b/src/lib-charset/Makefile.am
@@ -26,5 +26,5 @@ test_libs = \
 test_deps = $(noinst_LTLIBRARIES) $(test_libs)
 
 test_charset_SOURCES = test-charset.c
-test_charset_LDADD = libcharset.la $(test_libs)
+test_charset_LDADD = libcharset.la $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_charset_DEPENDENCIES = libcharset.la $(test_deps)

diff --git a/src/lib-compression/Makefile.am b/src/lib-compression/Makefile.am
index fd36d35792fea9f9d4417b3aed00a433b4902a21..f254f808e45a09576b97ed18a8223aee12452b80 100644 (file)
--- a/src/lib-compression/Makefile.am
+++ b/src/lib-compression/Makefile.am
@@ -51,9 +51,9 @@ test_libs = \
 test_deps = $(test_libs)
 
 test_compression_SOURCES = test-compression.c
-test_compression_LDADD = $(test_libs)
+test_compression_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_compression_DEPENDENCIES = $(test_deps)
 
 bench_compression_SOURCES = bench-compression.c
-bench_compression_LDADD = $(test_libs)
+bench_compression_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 bench_compression_DEPENDENCIES = $(test_deps)

diff --git a/src/lib-dcrypt/Makefile.am b/src/lib-dcrypt/Makefile.am
index 53cb67cd29f115f163d9f2172fecdcd4e6cb63b5..f247bdaf69e9a8e101ea4e90c883604732192a89 100644 (file)
--- a/src/lib-dcrypt/Makefile.am
+++ b/src/lib-dcrypt/Makefile.am
@@ -61,6 +61,7 @@ LIBDOVECOT_TEST_DEPS = \
        ../lib/liblib.la
 LIBDOVECOT_TEST = \
        $(LIBDOVECOT_TEST_DEPS) \
+       $(LIBDOVECOT_TEST_LIBS) \
        $(MODULE_LIBS)
 
 test_crypto_LDADD = $(LIBDOVECOT_TEST)

diff --git a/src/lib-dict-extra/Makefile.am b/src/lib-dict-extra/Makefile.am
index deaba460d58a9f5a140ba51b99d1b4468a6f0adf..a69d8bcf77659938413f2d4fad91f7943107b8a6 100644 (file)
--- a/src/lib-dict-extra/Makefile.am
+++ b/src/lib-dict-extra/Makefile.am
@@ -39,5 +39,5 @@ test_libs = \
        ../lib/liblib.la
 
 test_dict_fs_SOURCES = test-dict-fs.c
-test_dict_fs_LDADD = $(noinst_LTLIBRARIES) ../lib-fs/libfs.la $(test_libs) $(MODULE_LIBS)
+test_dict_fs_LDADD = $(noinst_LTLIBRARIES) ../lib-fs/libfs.la $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_dict_fs_DEPENDENCIES = $(noinst_LTLIBRARIES) ../lib-fs/libfs.la $(test_libs)

diff --git a/src/lib-dict/Makefile.am b/src/lib-dict/Makefile.am
index a54aab216fff1b0f6cfebca492e86d3ea15f86a8..7e11414e9c1c6db21994d52d1da3efea9ad247bb 100644 (file)
--- a/src/lib-dict/Makefile.am
+++ b/src/lib-dict/Makefile.am
@@ -62,5 +62,5 @@ test_libs = \
        ../lib/liblib.la
 
 test_dict_SOURCES = test-dict.c
-test_dict_LDADD = $(test_libs) $(DLLIB)
+test_dict_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_dict_DEPENDENCIES = $(test_libs)

diff --git a/src/lib-dns-client/Makefile.am b/src/lib-dns-client/Makefile.am
index d57003a6f679a3311f6d1e58939b729491abc209..9afa6009622a03c68da296d9ded8c8ba54ae92cc 100644 (file)
--- a/src/lib-dns-client/Makefile.am
+++ b/src/lib-dns-client/Makefile.am
@@ -31,7 +31,7 @@ test_libs = \
        ../lib/liblib.la
 
 test_dns_lookup_SOURCES = test-dns-lookup.c
-test_dns_lookup_LDADD = $(test_libs) $(DLLIB)
+test_dns_lookup_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-dns/Makefile.am b/src/lib-dns/Makefile.am
index 386f3f3320c1302aa5fb060619b82c8966f8f10f..cb144bdf4d9bc74516f769300b4465a723043d33 100644 (file)
--- a/src/lib-dns/Makefile.am
+++ b/src/lib-dns/Makefile.am
@@ -21,7 +21,7 @@ test_libs = \
        ../lib/liblib.la
 
 test_dns_util_SOURCES = test-dns-util.c
-test_dns_util_LDADD = $(test_libs)
+test_dns_util_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 
 pkginc_libdir=$(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)

diff --git a/src/lib-fs/Makefile.am b/src/lib-fs/Makefile.am
index 71527893a9f1d0ead1405aa93c2f272863a0001a..ab0e270e22233e31410d0aad070b82fb380e2bb4 100644 (file)
--- a/src/lib-fs/Makefile.am
+++ b/src/lib-fs/Makefile.am
@@ -60,7 +60,7 @@ test_deps = \
 
 test_libs = \
        $(test_deps) \
-       $(MODULE_LIBS)
+       $(LIBDOVECOT_TEST_LIBS)
 
 test_fs_metawrap_SOURCES = test-fs-metawrap.c
 test_fs_metawrap_LDADD = $(test_libs)

diff --git a/src/lib-http/Makefile.am b/src/lib-http/Makefile.am
index fb7265561d39c556183961988e0165d34d97603c..9636f83e74c7a1941e340a791aba7e97bc1c7ce4 100644 (file)
--- a/src/lib-http/Makefile.am
+++ b/src/lib-http/Makefile.am
@@ -87,8 +87,7 @@ test_libs = \
        ../lib-var-expand/libvar_expand.la \
        ../lib-regex/libdregex.la \
        ../lib-test/libtest.la \
-       ../lib/liblib.la \
-       $(MODULE_LIBS)
+       ../lib/liblib.la
 
 test_deps = \
        $(noinst_LTLIBRARIES) \
@@ -100,15 +99,15 @@ test_deps = \
        ../lib/liblib.la
 
 test_http_url_SOURCES = test-http-url.c
-test_http_url_LDADD = http-url.lo http-header.lo $(test_libs)
+test_http_url_LDADD = http-url.lo http-header.lo $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_http_url_DEPENDENCIES = $(test_deps)
 
 test_http_date_SOURCES = test-http-date.c
-test_http_date_LDADD = http-date.lo  $(test_libs)
+test_http_date_LDADD = http-date.lo  $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_http_date_DEPENDENCIES = $(test_deps)
 
 test_http_header_parser_SOURCES = test-http-header-parser.c
-test_http_header_parser_LDADD = http-parser.lo http-header-parser.lo http-header.lo $(test_libs)
+test_http_header_parser_LDADD = http-parser.lo http-header-parser.lo http-header.lo $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_http_header_parser_DEPENDENCIES = $(test_deps)
 
 test_http_transfer_SOURCES = test-http-transfer.c
@@ -117,14 +116,14 @@ test_http_transfer_LDADD = \
        http-header-parser.lo \
        http-transfer-chunked.lo \
        http-header.lo \
-       $(test_libs)
+       $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_http_transfer_DEPENDENCIES = $(test_deps)
 
 test_http_auth_SOURCES = test-http-auth.c
 test_http_auth_LDADD = \
        http-auth.lo \
        http-parser.lo \
-       $(test_libs)
+       $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_http_auth_DEPENDENCIES = $(test_deps)
 
 test_http_response_parser_SOURCES = test-http-response-parser.c
@@ -136,7 +135,7 @@ test_http_response_parser_LDADD = \
        http-transfer-chunked.lo \
        http-message-parser.lo \
        http-response-parser.lo \
-       $(test_libs)
+       $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_http_response_parser_DEPENDENCIES = $(test_deps)
 
 test_http_request_parser_SOURCES = test-http-request-parser.c
@@ -149,7 +148,7 @@ test_http_request_parser_LDADD = \
        http-transfer-chunked.lo \
        http-message-parser.lo \
        http-request-parser.lo \
-       $(test_libs)
+       $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_http_request_parser_DEPENDENCIES = $(test_deps)
 
 test_http_libs = \
@@ -159,7 +158,7 @@ test_http_libs = \
        ../lib-ssl-iostream/libssl_iostream.la \
        ../lib-master/libmaster.la \
        ../lib-auth-client/libauth-client.la \
-       $(test_libs)
+       $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_http_deps = \
        libhttp.la \
        ../lib-dns-client/libdns-client.la  \
@@ -169,7 +168,7 @@ test_http_deps = \
        ../lib-auth-client/libauth-client.la \
        $(test_deps)
 
-test_http_libs_ssl = ../lib-ssl-iostream/libssl_iostream_openssl.la
+test_http_libs_ssl = ../lib-ssl-iostream/libssl_iostream_openssl.la $(LIBDOVECOT_TEST_LIBS)
 
 test_http_payload_SOURCES = test-http-payload.c
 test_http_payload_LDFLAGS = -export-dynamic

diff --git a/src/lib-imap-client/Makefile.am b/src/lib-imap-client/Makefile.am
index 64fb1510dc46489fd0c8e564caa62f9f29a52896..8cecba36a77bd54b098b1bedb427ce4d0da82e70 100644 (file)
--- a/src/lib-imap-client/Makefile.am
+++ b/src/lib-imap-client/Makefile.am
@@ -38,7 +38,7 @@ test_deps = \
 
 test_libs = \
        $(test_deps) \
-       $(MODULE_LIBS)
+       $(LIBDOVECOT_TEST_LIBS)
 
 test_imapc_client_SOURCES = test-imapc-client.c
 test_imapc_client_LDADD = $(test_libs)

diff --git a/src/lib-imap/Makefile.am b/src/lib-imap/Makefile.am
index 5bf88ab4026e4cf217f62a0bac5f7bc66d349477..24d337b1a10ed9a00c52ee107aa557376178ff8d 100644 (file)
--- a/src/lib-imap/Makefile.am
+++ b/src/lib-imap/Makefile.am
@@ -59,9 +59,10 @@ test_programs = \
 test_libs = \
        ../lib-charset/libcharset.la \
        ../lib-test/libtest.la \
-       ../lib/liblib.la
+       ../lib/liblib.la \
+       $(LIBDOVECOT_TEST_LIBS)
 
-test_deps = $(noinst_LTLIBRARIES) $(test_libs)
+test_deps = $(noinst_LTLIBRARIES)
 
 test_imap_bodystructure_SOURCES = test-imap-bodystructure.c
 test_imap_bodystructure_LDADD = imap-bodystructure.lo imap-envelope.lo imap-quote.lo imap-parser.lo imap-arg.lo ../lib-mail/libmail.la $(test_libs)

diff --git a/src/lib-json/Makefile.am b/src/lib-json/Makefile.am
index 6fab5acc23023b6920322616f2c67aadb5796000..b55b8b1bc9e52b687f04b1d41a2d6527260a0469 100644 (file)
--- a/src/lib-json/Makefile.am
+++ b/src/lib-json/Makefile.am
@@ -53,14 +53,14 @@ json_format_LDADD = \
        libjson.la \
        ../lib-charset/libcharset.la \
        ../lib/liblib.la \
-       $(MODULE_LIBS)
+       $(LIBDOVECOT_TEST_LIBS)
 
 test_libs = \
        libjson.la \
        ../lib-test/libtest.la \
        ../lib-charset/libcharset.la \
        ../lib/liblib.la \
-       $(MODULE_LIBS)
+       $(LIBDOVECOT_TEST_LIBS)
 test_deps = \
        libjson.la \
        ../lib-test/libtest.la \

diff --git a/src/lib-language/Makefile.am b/src/lib-language/Makefile.am
index 945a96be11429428ac7b16fee5de2599674e7e14..199f7782ee1964991167e965c26b8939f4453258 100644 (file)
--- a/src/lib-language/Makefile.am
+++ b/src/lib-language/Makefile.am
@@ -108,20 +108,20 @@ test_libs = ../lib-dovecot/libdovecot.la
 test_deps = $(noinst_LTLIBRARIES) $(test_libs)
 
 test_lang_icu_SOURCES = test-lang-icu.c
-test_lang_icu_LDADD = lang-icu.lo $(LIBICU_LIBS) $(test_libs)
+test_lang_icu_LDADD = lang-icu.lo $(LIBICU_LIBS) $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_lang_icu_DEPENDENCIES = lang-icu.lo $(test_deps)
 
 test_lang_filter_SOURCES = test-lang-filter.c
-test_lang_filter_LDADD = liblanguage.la $(test_libs)
+test_lang_filter_LDADD = liblanguage.la $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_lang_filter_DEPENDENCIES = liblanguage.la $(test_deps)
 
 if BUILD_LANG_EXTTEXTCAT
 TEST_LANGUAGE = test-language
 test_language_SOURCES = test-language.c
-test_language_LDADD = language.lo $(test_libs) $(TEXTCAT_LIBS)
+test_language_LDADD = language.lo $(test_libs) $(LIBDOVECOT_TEST_LIBS) $(TEXTCAT_LIBS)
 test_language_DEPENDENCIES = $(test_deps)
 endif
 
 test_lang_tokenizer_SOURCES = test-lang-tokenizer.c
-test_lang_tokenizer_LDADD = liblanguage.la $(test_libs)
+test_lang_tokenizer_LDADD = liblanguage.la $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_lang_tokenizer_DEPENDENCIES = liblanguage.la $(test_deps)

diff --git a/src/lib-login/Makefile.am b/src/lib-login/Makefile.am
index 70b530e43d8abe102e61391ff2debcf941887078..bbe7ed1db221ee3fd23c568414c1133031003ca2 100644 (file)
--- a/src/lib-login/Makefile.am
+++ b/src/lib-login/Makefile.am
@@ -40,8 +40,7 @@ test_libs = \
        ../lib-var-expand/libvar_expand.la \
        ../lib-regex/libdregex.la \
        ../lib-test/libtest.la \
-       ../lib/liblib.la \
-       $(MODULE_LIBS)
+       ../lib/liblib.la
 
 test_deps = \
        liblogin.la \
@@ -58,5 +57,5 @@ test_deps = \
        ../lib/liblib.la
 
 test_login_server_auth_SOURCES = test-login-server-auth.c
-test_login_server_auth_LDADD = $(test_libs)
+test_login_server_auth_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_login_server_auth_DEPENDENCIES = $(test_deps)

diff --git a/src/lib-mail/Makefile.am b/src/lib-mail/Makefile.am
index fd8d42bb90b347e20b63376804be83146810ac3d..8a4a0ef0bd5fe0b09cf8968623d70ec475e92d67 100644 (file)
--- a/src/lib-mail/Makefile.am
+++ b/src/lib-mail/Makefile.am
@@ -113,6 +113,13 @@ test_programs = \
        test-rfc2231-parser \
        test-rfc822-parser
 
+test_deps = $(noinst_LTLIBRARIES) \
+       ../lib-charset/libcharset.la \
+       ../lib-test/libtest.la \
+       ../lib/liblib.la
+
+test_libs = $(test_deps) $(LIBDOVECOT_TEST_LIBS)
+
 fuzz_programs =
 
 if USE_FUZZER
@@ -157,13 +164,6 @@ endif
 
 noinst_PROGRAMS += $(fuzz_programs)
 
-test_libs = \
-       $(noinst_LTLIBRARIES) \
-       ../lib-charset/libcharset.la \
-       ../lib-test/libtest.la \
-       ../lib/liblib.la
-
-test_deps = $(noinst_LTLIBRARIES) $(test_libs)
 
 test_istream_dot_SOURCES = test-istream-dot.c
 test_istream_dot_LDADD = $(test_libs)

diff --git a/src/lib-master/Makefile.am b/src/lib-master/Makefile.am
index 3c11d83c988e0b78001249374da167f90a0acbdd..89e5c41f3ee69d1e4b94a5e2fa35bdd904834d19 100644 (file)
--- a/src/lib-master/Makefile.am
+++ b/src/lib-master/Makefile.am
@@ -63,13 +63,12 @@ test_deps = \
        ../lib/liblib.la
 
 test_libs = \
-       $(test_deps) \
-       $(MODULE_LIBS)
+       $(test_deps)
 
 test_event_stats_SOURCES = test-event-stats.c
-test_event_stats_LDADD = $(test_libs)
+test_event_stats_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_event_stats_DEPENDENCIES = $(test_deps)
 
 test_master_service_settings_SOURCES = test-master-service-settings.c
-test_master_service_settings_LDADD = $(test_libs)
+test_master_service_settings_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_master_service_settings_DEPENDENCIES = $(test_deps)

diff --git a/src/lib-oauth2/Makefile.am b/src/lib-oauth2/Makefile.am
index fe6bfd88c2a1e532c253b5a9af68b8c04ab97ec3..9e2533df38e484a4e48a1050815ca73c2366de93 100644 (file)
--- a/src/lib-oauth2/Makefile.am
+++ b/src/lib-oauth2/Makefile.am
@@ -49,8 +49,7 @@ test_libs = \
        ../lib-var-expand/libvar_expand.la \
        ../lib-regex/libdregex.la \
        ../lib-test/libtest.la \
-       ../lib/liblib.la \
-       $(MODULE_LIBS)
+       ../lib/liblib.la
 test_deps = \
        $(noinst_LTLIBRARIES) \
        ../lib-dcrypt/libdcrypt_openssl_static.la \
@@ -71,11 +70,11 @@ test_deps = \
        ../lib/liblib.la
 
 test_oauth2_json_SOURCES = test-oauth2-json.c
-test_oauth2_json_LDADD = $(test_libs)
+test_oauth2_json_LDADD = $(test_libs) $(SSL_LIBS) $(LIBDOVECOT_TEST_LIBS)
 test_oauth2_json_DEPENDENCIES = $(test_deps)
 
 test_oauth2_jwt_SOURCES = test-oauth2-jwt.c
-test_oauth2_jwt_LDADD = $(test_libs)
+test_oauth2_jwt_LDADD = $(test_libs) $(SSL_LIBS) $(LIBDOVECOT_TEST_LIBS)
 if HAVE_WHOLE_ARCHIVE
 test_oauth2_jwt_LDFLAGS = \
        -Wl,$(LD_WHOLE_ARCHIVE),../lib-json/.libs/libjson.a,../lib-ssl-iostream/.libs/libssl_iostream.a,$(LD_NO_WHOLE_ARCHIVE)

diff --git a/src/lib-program-client/Makefile.am b/src/lib-program-client/Makefile.am
index 5f4c175394c9229d3449561e340f6a82e851c895..ec075f8eb38e7186c88dfc7a84a5b94fba17835f 100644 (file)
--- a/src/lib-program-client/Makefile.am
+++ b/src/lib-program-client/Makefile.am
@@ -42,14 +42,13 @@ test_libs = \
        ../lib-charset/libcharset.la \
        ../lib-var-expand/libvar_expand.la \
        ../lib-regex/libdregex.la \
-       ../lib/liblib.la \
-       $(MODULE_LIBS)
+       ../lib/liblib.la
 
 test_program_client_local_SOURCE = test-program-client-local.c
-test_program_client_local_LDADD = $(test_libs)
+test_program_client_local_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 
 test_program_client_unix_SOURCE = test-program-client-unix.c
-test_program_client_unix_LDADD = $(test_libs)
+test_program_client_unix_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 
 test_program_client_net_SOURCE = test-program-client-net.c
-test_program_client_net_LDADD = $(test_libs)
+test_program_client_net_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)

diff --git a/src/lib-regex/Makefile.am b/src/lib-regex/Makefile.am
index 302ca113027459ce968388f94ee79f5e510debba..56ac72940a3ce00c0fa386b51b79301778cb9bc8 100644 (file)
--- a/src/lib-regex/Makefile.am
+++ b/src/lib-regex/Makefile.am
@@ -33,7 +33,7 @@ test_regex_SOURCES = test-regex.c
 test_regex_LDADD = libdregex.la \
                   ../lib-test/libtest.la \
                   ../lib/liblib.la \
-                  $(LIBPCRE_LIBS)
+                  $(LIBDOVECOT_TEST_LIBS)
 test_regex_DEPENDENCIES = libdregex.la
 
 else

diff --git a/src/lib-sasl/Makefile.am b/src/lib-sasl/Makefile.am
index 734589cc46835f962e9ec25b7e4321741cc729c1..55ff9eead1b2decd5559a098f23701695cc43084 100644 (file)
--- a/src/lib-sasl/Makefile.am
+++ b/src/lib-sasl/Makefile.am
@@ -109,17 +109,17 @@ test_libs = \
 test_deps = $(test_libs)
 
 test_sasl_oauth2_SOURCES = test-sasl-oauth2.c
-test_sasl_oauth2_LDADD = $(test_libs)
+test_sasl_oauth2_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_sasl_oauth2_DEPENDENCIES = $(test_deps)
 
 test_sasl_client_SOURCES = test-sasl-client.c
-test_sasl_client_LDADD = $(test_libs)
+test_sasl_client_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_sasl_client_DEPENDENCIES = $(test_deps)
 
 test_sasl_authentication_SOURCES = \
        dsasl-client-mech-ntlm-dummy.c \
        test-sasl-authentication.c
-test_sasl_authentication_LDADD = $(test_libs)
+test_sasl_authentication_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_sasl_authentication_DEPENDENCIES = $(test_deps)
 if HAVE_GSSAPI
 test_sasl_authentication_SOURCES += \
@@ -143,7 +143,7 @@ fuzz_sasl_authentication_LDFLAGS = $(FUZZER_LDFLAGS)
 fuzz_sasl_authentication_SOURCES = \
        dsasl-client-mech-ntlm-dummy.c \
        fuzz-sasl-authentication.c
-fuzz_sasl_authentication_LDADD = $(test_libs)
+fuzz_sasl_authentication_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 fuzz_sasl_authentication_DEPENDENCIES = $(test_deps)
 if HAVE_GSSAPI
 fuzz_sasl_authentication_SOURCES += \

diff --git a/src/lib-settings/Makefile.am b/src/lib-settings/Makefile.am
index c17fead8694caafa360594fdeb7b2b19f6c78b69..38f96a57315a6ca360849129a6147cd567d28176 100644 (file)
--- a/src/lib-settings/Makefile.am
+++ b/src/lib-settings/Makefile.am
@@ -50,9 +50,9 @@ test_libs = \
        ../lib/liblib.la
 
 test_settings_parser_SOURCES = test-settings-parser.c
-test_settings_parser_LDADD = $(test_libs) $(DLLIB)
+test_settings_parser_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_settings_parser_DEPENDENCIES = $(test_libs)
 
 test_settings_SOURCES = test-settings.c
-test_settings_LDADD = $(test_libs) $(DLLIB)
+test_settings_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_settings_DEPENDENCIES = $(test_libs)

diff --git a/src/lib-smtp/Makefile.am b/src/lib-smtp/Makefile.am
index 1dbe59af66ccc85ce1d430826d561d8897a2328d..4c49770c20c74313180a849906169c74fceec497 100644 (file)
--- a/src/lib-smtp/Makefile.am
+++ b/src/lib-smtp/Makefile.am
@@ -129,7 +129,7 @@ test_libs = \
        ../lib-regex/libdregex.la \
        ../lib-test/libtest.la \
        ../lib/liblib.la \
-       $(MODULE_LIBS)
+       $(LIBDOVECOT_TEST_LIBS)
 
 test_deps = \
        $(noinst_LTLIBRARIES) \

diff --git a/src/lib-ssl-iostream/Makefile.am b/src/lib-ssl-iostream/Makefile.am
index a6e8ad22aea49712596d516d7985c45399f5f0f9..6089ad6620c0842f9ba58396892aac77982f2656 100644 (file)
--- a/src/lib-ssl-iostream/Makefile.am
+++ b/src/lib-ssl-iostream/Makefile.am
@@ -54,7 +54,7 @@ test_libs = \
        ../lib/liblib.la
 
 test_iostream_ssl_SOURCES = test-iostream-ssl.c
-test_iostream_ssl_LDADD = $(test_libs) $(SSL_LIBS) $(DLLIB)
+test_iostream_ssl_LDADD = $(test_libs) $(SSL_LIBS) $(LIBDOVECOT_TEST_LIBS)
 test_iostream_ssl_DEPENDENCIES = $(test_libs)
 
 test_programs = \

diff --git a/src/lib-var-expand-crypt/Makefile.am b/src/lib-var-expand-crypt/Makefile.am
index 24b6ca56f584d3901b6c60f19c30ad41f7e80890..12d424a84560c5db04e65922771f571ca99a42c8 100644 (file)
--- a/src/lib-var-expand-crypt/Makefile.am
+++ b/src/lib-var-expand-crypt/Makefile.am
@@ -30,11 +30,10 @@ test_libs = \
        ../lib-settings/libsettings.la \
        ../lib-dns/libdns.la \
        ../lib-test/libtest.la \
-       ../lib/liblib.la \
-       $(DLLIB)
+       ../lib/liblib.la
 
 test_var_expand_crypt_SOURCES = test-var-expand-crypt.c
-test_var_expand_crypt_LDADD = $(test_libs)
+test_var_expand_crypt_LDADD = $(test_libs) $(SSL_LIBS) $(LIBDOVECOT_TEST_LIBS)
 test_var_expand_crypt_DEPENDENCIES = $(module_LTLIBRARIES)
 if HAVE_WHOLE_ARCHIVE
 test_var_expand_crypt_LDFLAGS = -export-dynamic -Wl,$(LD_WHOLE_ARCHIVE),../lib/.libs/liblib.a,../lib-json/.libs/libjson.a,../lib-ssl-iostream/.libs/libssl_iostream.a,$(LD_NO_WHOLE_ARCHIVE)

diff --git a/src/lib-var-expand/Makefile.am b/src/lib-var-expand/Makefile.am
index 17bb46a510030c1c2a105eafb8299a4bca53414d..fc21ede3eafe3398d6a14ebfda4936e2e98b05dd 100644 (file)
--- a/src/lib-var-expand/Makefile.am
+++ b/src/lib-var-expand/Makefile.am
@@ -62,11 +62,10 @@ test_libs = \
        libvar_expand.la \
        ../lib-regex/libdregex.la \
        ../lib-test/libtest.la \
-       ../lib/liblib.la \
-       $(MODULE_LIBS)
+       ../lib/liblib.la
 
 test_var_expand_SOURCE = test-var-expand.c
-test_var_expand_LDADD = $(test_libs)
+test_var_expand_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 
 if USE_FUZZER
 fuzz_programs = fuzz-var-expand
@@ -76,7 +75,7 @@ nodist_EXTRA_fuzz_var_expand_SOURCES = force-cxx-linking.cxx
 fuzz_var_expand_CPPFLAGS = $(FUZZER_CPPFLAGS)
 fuzz_var_expand_LDFLAGS = $(FUZZER_LDFLAGS)
 fuzz_var_expand_SOURCES = fuzz-var-expand.c
-fuzz_var_expand_LDADD = $(test_libs)
+fuzz_var_expand_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 fuzz_var_expand_DEPENDENCIES = libvar_expand.la
 
 noinst_PROGRAMS += $(fuzz_programs)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 1a66ff4b077f72961d60b2f0269bddab1e9f7c28..f83435e30d58c8463671ba24ce070c5fdbc13a8a 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -529,12 +529,12 @@ test_headers = \
        test-lib.h \
        test-lib.inc
 
-test_lib_LDADD = $(test_libs) -lm
+test_lib_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_lib_DEPENDENCIES = $(test_libs)
 
 test_cpu_limit_SOURCES = \
        test-cpu-limit.c
-test_cpu_limit_LDADD = $(test_libs) -lm
+test_cpu_limit_LDADD = $(test_libs) $(LIBDOVECOT_TEST_LIBS)
 test_cpu_limit_DEPENDENCIES = $(test_libs)
 
 pkginc_libdir=$(pkgincludedir)