From: Timo Sirainen Date: Fri, 6 Sep 2024 07:18:55 +0000 (+0300) Subject: global: Makefile.am - Use LIBDOVECOT* variables where possible X-Git-Tag: 2.4.0~1471 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2d22085c95d96dfd9b6a9ceb77afa8ae1980a50;p=thirdparty%2Fdovecot%2Fcore.git global: Makefile.am - Use LIBDOVECOT* variables where possible It behaves differently when using static linking. --- diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am index 36982e84fa..c4c5fb3578 100644 --- a/src/auth/Makefile.am +++ b/src/auth/Makefile.am @@ -212,12 +212,9 @@ noinst_PROGRAMS = $(test_programs) noinst_HEADERS = test-auth.h db-lua.h test-auth-master.h -test_libs = \ - ../lib-dovecot/libdovecot.la - test_auth_cache_SOURCES = auth-cache.c test-auth-cache.c -test_auth_cache_LDADD = $(test_libs) -test_auth_cache_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs) +test_auth_cache_LDADD = $(LIBDOVECOT) +test_auth_cache_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(LIBDOVECOT_DEPS) # this is needed to force auth-cache.c recompilation test_auth_cache_CPPFLAGS = $(AM_CPPFLAGS) @@ -230,24 +227,24 @@ test_auth_SOURCES = \ test-mock.c \ test-main.c -test_auth_LDADD = $(test_libs) $(auth_libs) $(AUTH_LIBS) $(LUA_LIBS) -test_auth_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs) +test_auth_LDADD = $(LIBDOVECOT) $(auth_libs) $(AUTH_LIBS) $(LUA_LIBS) +test_auth_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(LIBDOVECOT_DEPS) test_mech_SOURCES = \ test-auth.c \ test-mock.c \ test-mech.c -test_mech_LDADD = $(test_libs) $(auth_libs) $(AUTH_LIBS) $(LUA_LIBS) -test_mech_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs) +test_mech_LDADD = $(LIBDOVECOT) $(auth_libs) $(AUTH_LIBS) $(LUA_LIBS) +test_mech_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(LIBDOVECOT_DEPS) test_auth_client_SOURCES = \ test-auth.c \ test-mock.c \ test-auth-client.c -test_auth_client_LDADD = $(test_libs) $(auth_libs) $(AUTH_LIBS) $(LUA_LIBS) -test_auth_client_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs) +test_auth_client_LDADD = $(LIBDOVECOT) $(auth_libs) $(AUTH_LIBS) $(LUA_LIBS) +test_auth_client_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(LIBDOVECOT_DEPS) test_auth_master_SOURCES = \ test-auth.c \ @@ -255,8 +252,8 @@ test_auth_master_SOURCES = \ test-auth-master.c \ test-auth-master-server.c -test_auth_master_LDADD = $(test_libs) $(auth_libs) $(AUTH_LIBS) $(LUA_LIBS) -test_auth_master_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(test_libs) +test_auth_master_LDADD = $(LIBDOVECOT) $(auth_libs) $(AUTH_LIBS) $(LUA_LIBS) +test_auth_master_DEPENDENCIES = $(pkglibexec_PROGRAMS) $(LIBDOVECOT_DEPS) check-local: diff --git a/src/doveadm/dsync/Makefile.am b/src/doveadm/dsync/Makefile.am index 20cbfc74f3..e696b8d342 100644 --- a/src/doveadm/dsync/Makefile.am +++ b/src/doveadm/dsync/Makefile.am @@ -34,8 +34,8 @@ libdsync_la_SOURCES = \ dsync-transaction-log-scan.c libdovecot_dsync_la_SOURCES = -libdovecot_dsync_la_LIBADD = libdsync.la ../../lib-storage/libdovecot-storage.la ../../lib-dovecot/libdovecot.la -libdovecot_dsync_la_DEPENDENCIES = libdsync.la +libdovecot_dsync_la_LIBADD = libdsync.la $(LIBDOVECOT_STORAGE) $(LIBDOVECOT) +libdovecot_dsync_la_DEPENDENCIES = libdsync.la $(LIBDOVECOT_STORAGE_DEPS) $(LIBDOVECOT_DEPS) libdovecot_dsync_la_LDFLAGS = -export-dynamic pkginc_libdir = $(pkgincludedir) diff --git a/src/lib-compression/Makefile.am b/src/lib-compression/Makefile.am index f13b9fcbd5..40ccdf095b 100644 --- a/src/lib-compression/Makefile.am +++ b/src/lib-compression/Makefile.am @@ -31,8 +31,8 @@ noinst_HEADERS = \ pkglib_LTLIBRARIES = libdovecot-compression.la libdovecot_compression_la_SOURCES = -libdovecot_compression_la_LIBADD = libcompression.la ../lib-dovecot/libdovecot.la $(COMPRESS_LIBS) -libdovecot_compression_la_DEPENDENCIES = libcompression.la ../lib-dovecot/libdovecot.la +libdovecot_compression_la_LIBADD = libcompression.la $(LIBDOVECOT) $(COMPRESS_LIBS) +libdovecot_compression_la_DEPENDENCIES = libcompression.la $(LIBDOVECOT_DEPS) libdovecot_compression_la_LDFLAGS = -export-dynamic test_programs = \ diff --git a/src/lib-dict-backend/Makefile.am b/src/lib-dict-backend/Makefile.am index 5dc60bb810..cb50f0710e 100644 --- a/src/lib-dict-backend/Makefile.am +++ b/src/lib-dict-backend/Makefile.am @@ -103,12 +103,12 @@ test_dict_sql_LDADD = \ $(DICT_LIBS) \ ../lib-sql/libdriver_test.la \ ../lib-sql/libsql.la \ - ../lib-dovecot/libdovecot.la + $(LIBDOVECOT) test_dict_sql_DEPENDENCIES = \ $(noinst_LTLIBRARIES) \ ../lib-sql/libdriver_test.la \ ../lib-sql/libsql.la \ - ../lib-dovecot/libdovecot.la + $(LIBDOVECOT_DEPS) check-local: for bin in $(test_programs) $(check_PROGRAMS); do \ diff --git a/src/lib-fts/Makefile.am b/src/lib-fts/Makefile.am index 6ddc35b2ca..8fd04fb5d0 100644 --- a/src/lib-fts/Makefile.am +++ b/src/lib-fts/Makefile.am @@ -111,12 +111,10 @@ headers = \ pkginc_libdir=$(pkgincludedir) pkginc_lib_HEADERS = $(headers) -deps=../lib-dovecot/libdovecot.la - pkglib_LTLIBRARIES = libdovecot-fts.la libdovecot_fts_la_SOURCES = -libdovecot_fts_la_LIBADD = libfts.la $(deps) -libdovecot_fts_la_DEPENDENCIES = libfts.la $(deps) +libdovecot_fts_la_LIBADD = libfts.la $(LIBDOVECOT) +libdovecot_fts_la_DEPENDENCIES = libfts.la $(LIBDOVECOT_DEPS) libdovecot_fts_la_LDFLAGS = -export-dynamic test_programs = \ diff --git a/src/lib-lda/Makefile.am b/src/lib-lda/Makefile.am index 00c613ee59..e02b955be6 100644 --- a/src/lib-lda/Makefile.am +++ b/src/lib-lda/Makefile.am @@ -24,12 +24,10 @@ headers = \ pkginc_libdir=$(pkgincludedir) pkginc_lib_HEADERS = $(headers) -deps=../lib-storage/libdovecot-storage.la ../lib-dovecot/libdovecot.la - pkglib_LTLIBRARIES = libdovecot-lda.la libdovecot_lda_la_SOURCES = -libdovecot_lda_la_LIBADD = liblda.la $(deps) -libdovecot_lda_la_DEPENDENCIES = liblda.la $(deps) +libdovecot_lda_la_LIBADD = liblda.la $(LIBDOVECOT_STORAGE) $(LIBDOVECOT) +libdovecot_lda_la_DEPENDENCIES = liblda.la $(LIBDOVECOT_STORAGE_DEPS) $(LIBDOVECOT_DEPS) libdovecot_lda_la_LDFLAGS = -export-dynamic diff --git a/src/lib-ldap/Makefile.am b/src/lib-ldap/Makefile.am index 14f53a6ba4..d74bdbae09 100644 --- a/src/lib-ldap/Makefile.am +++ b/src/lib-ldap/Makefile.am @@ -17,9 +17,9 @@ libdovecot_ldap_la_SOURCES = \ ldap-compare.c \ ldap-entry.c -libdovecot_ldap_la_DEPENDENCIES = ../lib-dovecot/libdovecot.la +libdovecot_ldap_la_DEPENDENCIES = $(LIBDOVECOT_DEPS) libdovecot_ldap_la_LDFLAGS = -export-dynamic -libdovecot_ldap_la_LIBADD = ../lib-dovecot/libdovecot.la $(LDAP_LIBS) +libdovecot_ldap_la_LIBADD = $(LIBDOVECOT) $(LDAP_LIBS) headers = \ ldap-client.h diff --git a/src/lib-lua/Makefile.am b/src/lib-lua/Makefile.am index 7fee906c79..df3b6128bf 100644 --- a/src/lib-lua/Makefile.am +++ b/src/lib-lua/Makefile.am @@ -37,10 +37,10 @@ endif # Note: the only things this lib should depend on are libdovecot and lua. libdovecot_lua_la_DEPENDENCIES = \ - ../lib-dovecot/libdovecot.la \ + $(LIBDOVECOT_DEPS) \ $(WITH_YIELDS_LUA) libdovecot_lua_la_LIBADD = \ - ../lib-dovecot/libdovecot.la \ + $(LIBDOVECOT) \ $(WITH_YIELDS_LUA) \ $(LUA_LIBS) libdovecot_lua_la_LDFLAGS = -export-dynamic @@ -60,28 +60,27 @@ EXTRA_DIST = \ noinst_PROGRAMS = $(test_programs) test_libs =\ - libdovecot-lua.la \ - ../lib-dovecot/libdovecot.la + libdovecot-lua.la test_libs_ssl = ../lib-ssl-iostream/libssl_iostream_openssl.la test_lua_SOURCES = test-lua.c test_lua_CFLAGS = $(AM_CPPFLAGS) $(BINARY_CFLAGS) test_lua_LDFLAGS = $(BINARY_LDFLAGS) -test_lua_LDADD = $(test_libs) $(LUA_LIBS) -test_lua_DEPENDENCIES = $(test_libs) +test_lua_LDADD = $(test_libs) $(LIBDOVECOT) $(LUA_LIBS) +test_lua_DEPENDENCIES = $(test_libs) $(LIBDOVECOT_DEPS) test_dict_lua_SOURCES = test-dict-lua.c -test_dict_lua_LDADD = $(test_libs) $(LUA_LIBS) -test_dict_lua_DEPENDENCIES = $(test_libs) +test_dict_lua_LDADD = $(test_libs) $(LIBDOVECOT) $(LUA_LIBS) +test_dict_lua_DEPENDENCIES = $(test_libs) $(LIBDOVECOT_DEPS) test_dns_lua_SOURCES = test-dns-lua.c -test_dns_lua_LDADD = $(test_libs) $(LUA_LIBS) -test_dns_lua_DEPENDENCIES = $(test_libs) +test_dns_lua_LDADD = $(test_libs) $(LIBDOVECOT) $(LUA_LIBS) +test_dns_lua_DEPENDENCIES = $(test_libs) $(LIBDOVECOT_DEPS) test_lua_http_client_SOURCES = test-lua-http-client.c -test_lua_http_client_LDADD = $(test_libs) $(test_libs_ssl) $(LUA_LIBS) -test_lua_http_client_DEPENDENCIES = $(test_libs) +test_lua_http_client_LDADD = $(test_libs) $(LIBDOVECOT) $(test_libs_ssl) $(LUA_LIBS) +test_lua_http_client_DEPENDENCIES = $(test_libs) $(LIBDOVECOT_DEPS) test_lua_http_client_CFLAGS = \ $(AM_CPPFLAGS) \ $(DOVECOT_BINARY_CFLAGS) \ diff --git a/src/lib-sql/Makefile.am b/src/lib-sql/Makefile.am index f327fc239c..a5157d1283 100644 --- a/src/lib-sql/Makefile.am +++ b/src/lib-sql/Makefile.am @@ -60,9 +60,6 @@ libsql_la_LIBADD = $(SQL_LIBS) nodist_libsql_la_SOURCES = sql-drivers-register.c -deplibs = \ - ../lib-dovecot/libdovecot.la - if SQL_PLUGINS libdriver_mysql_la_LDFLAGS = -module -avoid-version libdriver_mysql_la_LIBADD = $(MYSQL_LIBS) @@ -95,8 +92,8 @@ noinst_HEADERS = driver-test.h pkglib_LTLIBRARIES = libdovecot-sql.la libdovecot_sql_la_SOURCES = -libdovecot_sql_la_LIBADD = libsql.la $(deplibs) -libdovecot_sql_la_DEPENDENCIES = libsql.la +libdovecot_sql_la_LIBADD = libsql.la $(LIBDOVECOT) +libdovecot_sql_la_DEPENDENCIES = libsql.la $(LIBDOVECOT_DEPS) libdovecot_sql_la_LDFLAGS = -export-dynamic headers = \ diff --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am index 9815623c5e..6072c9aafb 100644 --- a/src/lib-storage/Makefile.am +++ b/src/lib-storage/Makefile.am @@ -129,11 +129,10 @@ pkglib_LTLIBRARIES = libdovecot-storage.la libdovecot_storage_la_SOURCES = libdovecot_storage_la_LIBADD = \ libstorage.la \ - ../lib-dovecot/libdovecot.la \ + $(LIBDOVECOT) \ $(LINKED_STORAGE_LDADD) libdovecot_storage_la_DEPENDENCIES = \ libstorage.la \ - ../lib-dovecot/libdovecot.la \ $(LIBDOVECOT_DEPS) libdovecot_storage_la_LDFLAGS = -export-dynamic diff --git a/src/login-common/Makefile.am b/src/login-common/Makefile.am index 9c3afa1ce2..d9e300ff35 100644 --- a/src/login-common/Makefile.am +++ b/src/login-common/Makefile.am @@ -34,6 +34,6 @@ pkginc_lib_HEADERS = $(headers) pkglib_LTLIBRARIES = libdovecot-login.la libdovecot_login_la_SOURCES = -libdovecot_login_la_LIBADD = liblogin.la ../lib-dovecot/libdovecot.la $(SSL_LIBS) -libdovecot_login_la_DEPENDENCIES = liblogin.la +libdovecot_login_la_LIBADD = liblogin.la $(LIBDOVECOT) $(SSL_LIBS) +libdovecot_login_la_DEPENDENCIES = liblogin.la $(LIBDOVECOT_DEPS) libdovecot_login_la_LDFLAGS = -export-dynamic diff --git a/src/plugins/var-expand-crypt/Makefile.am b/src/plugins/var-expand-crypt/Makefile.am index 6feb1a742d..d220979f1d 100644 --- a/src/plugins/var-expand-crypt/Makefile.am +++ b/src/plugins/var-expand-crypt/Makefile.am @@ -28,7 +28,10 @@ test_var_expand_crypt_CFLAGS = \ test_var_expand_crypt_SOURCES = \ test-var-expand-crypt.c test_var_expand_crypt_LDADD = \ - ../../lib-dovecot/libdovecot.la \ + $(LIBDOVECOT) \ + lib20_auth_var_expand_crypt.la +test_var_expand_crypt_DEPENDENCIES = \ + $(LIBDOVECOT_DEPS) \ lib20_auth_var_expand_crypt.la check-local: