]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
global: Fix wrong inheritance of AM_CFLAGS/AM_CPPFLAGS in target_CFLAGS
authorJan Engelhardt <jengelh@inai.de>
Mon, 26 May 2025 10:26:28 +0000 (12:26 +0200)
committeraki.tuomi <aki.tuomi@open-xchange.com>
Tue, 27 May 2025 18:01:55 +0000 (18:01 +0000)
target_CFLAGS overrides AM_CFLAGS, not AM_CPPFLAGS, thus $(AM_CFLAGS),
not $(AM_CPPFLAGS), is needed in target_CFLAGS.

src/config/Makefile.am
src/lib-dcrypt/Makefile.am
src/lib-dict-backend/Makefile.am
src/lib-lua/Makefile.am
src/lib-var-expand-crypt/Makefile.am
src/plugins/mail-crypt/Makefile.am
src/plugins/push-notification/Makefile.am

index 0117a1077eff7ea9f31792f7cba491a350c5b97c..efedcb93ca2b692623cafacc87525f8978fb9cd1 100644 (file)
@@ -102,7 +102,7 @@ test_libs = \
        $(noinst_LTLIBRARIES) \
        $(LIBDOVECOT)
 
-test_config_parser_CFLAGS = $(AM_CPPFLAGS)
+test_config_parser_CFLAGS = $(AM_CFLAGS)
 test_config_parser_SOURCES = test-config-parser.c
 test_config_parser_LDADD = $(test_libs)
 test_config_parser_DEPENDENCIES = $(LIBDOVECOT_DEPS) $(noinst_LTLIBRARIES)
index d84dffb0e79a421d1d4257d46cafb5a936f9b29a..b3d85b813a17e52b1fc7a55b0b1fb77a50b2fe66 100644 (file)
@@ -15,14 +15,13 @@ libdcrypt_la_SOURCES = \
        istream-decrypt.c \
        ostream-encrypt.c
 
-libdcrypt_la_CFLAGS = $(AM_CPPFLAGS)
+libdcrypt_la_CFLAGS = $(AM_CFLAGS)
 
 libdcrypt_openssl_static_la_SOURCES = dcrypt-openssl1.c dcrypt-openssl3.c
 libdcrypt_openssl_static_la_LDFLAGS = ../lib-ssl-iostream/libssl_iostream_openssl.la
 libdcrypt_openssl_static_la_LIBADD = $(SSL_LIBS)
 libdcrypt_openssl_static_la_DEPENDENCIES = ../lib-ssl-iostream/libssl_iostream_openssl.la
-libdcrypt_openssl_static_la_CFLAGS = $(AM_CPPFLAGS) \
-       $(SSL_CFLAGS)
+libdcrypt_openssl_static_la_CFLAGS = $(AM_CFLAGS) $(SSL_CFLAGS)
 
 module_LTLIBRARIES += libdcrypt_openssl.la
 
@@ -30,8 +29,7 @@ libdcrypt_openssl_la_SOURCES = dcrypt-openssl1.c dcrypt-openssl3.c
 libdcrypt_openssl_la_LDFLAGS = -module -avoid-version ../lib-ssl-iostream/libssl_iostream_openssl.la
 libdcrypt_openssl_la_LIBADD = $(SSL_LIBS)
 libdcrypt_openssl_la_DEPENDENCIES = ../lib-ssl-iostream/libssl_iostream_openssl.la
-libdcrypt_openssl_la_CFLAGS = $(AM_CPPFLAGS) \
-       $(SSL_CFLAGS)
+libdcrypt_openssl_la_CFLAGS = $(AM_CFLAGS) $(SSL_CFLAGS)
 
 headers = \
        dcrypt.h \
@@ -73,7 +71,7 @@ test_crypto_DEPENDENCIES = $(LIBDOVECOT_TEST_DEPS)
 if HAVE_WHOLE_ARCHIVE
 test_crypto_LDFLAGS = -export-dynamic -Wl,$(LD_WHOLE_ARCHIVE),../lib-var-expand/.libs/libvar_expand.a,../lib/.libs/liblib.a,../lib-json/.libs/libjson.a,../lib-ssl-iostream/.libs/libssl_iostream.a,$(LD_NO_WHOLE_ARCHIVE)
 endif
-test_crypto_CFLAGS = $(AM_CPPFLAGS) -DDCRYPT_SRC_DIR=\"$(top_srcdir)/src/lib-dcrypt\"
+test_crypto_CFLAGS = $(AM_CFLAGS) -DDCRYPT_SRC_DIR=\"$(top_srcdir)/src/lib-dcrypt\"
 test_crypto_SOURCES = $(libdcrypt_la_SOURCES) test-crypto.c
 
 test_stream_LDADD = $(LIBDOVECOT_TEST)
@@ -81,5 +79,5 @@ test_stream_DEPENDENCIES = $(LIBDOVECOT_TEST_DEPS)
 if HAVE_WHOLE_ARCHIVE
 test_stream_LDFLAGS = -export-dynamic -Wl,$(LD_WHOLE_ARCHIVE),../lib-var-expand/.libs/libvar_expand.a,../lib/.libs/liblib.a,../lib-json/.libs/libjson.a,../lib-ssl-iostream/.libs/libssl_iostream.a,$(LD_NO_WHOLE_ARCHIVE)
 endif
-test_stream_CFLAGS = $(AM_CPPFLAGS) -DDCRYPT_SRC_DIR=\"$(top_srcdir)/src/lib-dcrypt\"
+test_stream_CFLAGS = $(AM_CFLAGS) -DDCRYPT_SRC_DIR=\"$(top_srcdir)/src/lib-dcrypt\"
 test_stream_SOURCES = $(libdcrypt_la_SOURCES) test-stream.c
index 60a9382ed895bab9a63de884a857e4e0a2530588..5404433ce7915f36062d4131957761086c9f94f0 100644 (file)
@@ -46,7 +46,7 @@ LIBDICT_LDAP = libdict_ldap.la
 libdict_ldap_la_DEPENDENCIES = $(LIBDOVECOT_LDAP) $(LIBDOVECOT_DEPS)
 libdict_ldap_la_LDFLAGS = -module -avoid-version
 libdict_ldap_la_LIBADD = $(LIBDOVECOT_LDAP) $(LIBDOVECOT)
-libdict_ldap_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_BUILD
+libdict_ldap_la_CPPFLAGS = $(AM_CFLAGS) -DPLUGIN_BUILD
 libdict_ldap_la_SOURCES = $(ldap_sources)
 else
 if HAVE_LDAP
@@ -97,7 +97,7 @@ test_programs = \
 
 noinst_PROGRAMS = $(test_programs)
 
-test_dict_sql_CFLAGS = $(AM_CPPFLAGS) -DDICT_SRC_DIR=\"$(top_srcdir)/src/lib-dict-backend\"
+test_dict_sql_CFLAGS = $(AM_CFLAGS) -DDICT_SRC_DIR=\"$(top_srcdir)/src/lib-dict-backend\"
 test_dict_sql_SOURCES = \
        test-dict-sql.c
 test_dict_sql_LDADD = \
index 1fbcbc6a1c438912dd494c4bb4b3d8a1f4c4195d..0e8a011ca9e520e103342f90338094eded614f76 100644 (file)
@@ -71,7 +71,7 @@ noinst_PROGRAMS = $(test_programs)
 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_CFLAGS = $(AM_CFLAGS) $(BINARY_CFLAGS)
 test_lua_LDFLAGS = $(BINARY_LDFLAGS)
 test_lua_LDADD = libdlua.la $(LIBDOVECOT) $(LUA_LIBS)
 test_lua_DEPENDENCIES = libdlua.la $(LIBDOVECOT_DEPS)
@@ -92,7 +92,7 @@ test_lua_http_client_SOURCES = test-lua-http-client.c
 test_lua_http_client_LDADD = libdlua.la $(LIBDOVECOT) $(test_libs_ssl) $(LUA_LIBS)
 test_lua_http_client_DEPENDENCIES = libdlua.la $(LIBDOVECOT_DEPS)
 test_lua_http_client_CFLAGS = \
-       $(AM_CPPFLAGS) \
+       $(AM_CFLAGS) \
        $(DOVECOT_BINARY_CFLAGS) \
        -DTEST_LUA_SCRIPT_DIR=\"$(abs_top_srcdir)/src/lib-lua\"
 
index d62a948d4f840a5b8bdc59bcdbf42a4fe1ea5e97..dcf501c92102e7517209f263da7758c060ce4b41 100644 (file)
@@ -36,7 +36,7 @@ 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)
 endif
 
-test_var_expand_crypt_CFLAGS = $(AM_CPPFLAGS) \
+test_var_expand_crypt_CFLAGS = $(AM_CFLAGS) \
        -DDCRYPT_BUILD_DIR=\"$(top_builddir)/src/lib-dcrypt\"
 
 check-local:
index 07a16a279e9340cb791a90802fa75abebbd90763..e867edc54ac1af3a068d05b4b8c37e03f95954f6 100644 (file)
@@ -78,7 +78,7 @@ test_fs_crypt_DEPENDENCIES = $(LIBDOVECOT_DEPS) \
        fs-crypt.lo \
        mail-crypt-global-key.lo
 test_fs_crypt_LDFLAGS = $(DOVECOT_BINARY_LDFLAGS)
-test_fs_crypt_CFLAGS = $(AM_CPPFLAGS) $(DOVECOT_BINARY_CFLAGS) -Dtop_builddir=\"$(top_builddir)\"
+test_fs_crypt_CFLAGS = $(AM_CFLAGS) $(DOVECOT_BINARY_CFLAGS) -Dtop_builddir=\"$(top_builddir)\"
 
 test_mail_global_key_SOURCES = \
        test-mail-global-key.c \
@@ -87,7 +87,7 @@ test_mail_global_key_SOURCES = \
 test_mail_global_key_LDADD = $(LIBDOVECOT)
 test_mail_global_key_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 test_mail_global_key_LDFLAGS = $(DOVECOT_BINARY_LDFLAGS)
-test_mail_global_key_CFLAGS = $(AM_CPPFLAGS) $(DOVECOT_BINARY_CFLAGS) -Dtop_builddir=\"$(top_builddir)\"
+test_mail_global_key_CFLAGS = $(AM_CFLAGS) $(DOVECOT_BINARY_CFLAGS) -Dtop_builddir=\"$(top_builddir)\"
 
 test_mail_key_SOURCES = \
        test-mail-key.c \
@@ -98,7 +98,7 @@ test_mail_key_SOURCES = \
 test_mail_key_LDADD = $(LIBDOVECOT_STORAGE) $(LIBDOVECOT)
 test_mail_key_DEPENDENCIES = $(LIBDOVECOT_DEPS)  $(LIBDOVECOT_STORAGE_DEPS)
 test_mail_key_LDFLAGS = $(DOVECOT_BINARY_LDFLAGS)
-test_mail_key_CFLAGS = $(AM_CPPFLAGS) $(DOVECOT_BINARY_CFLAGS) -Dtop_builddir=\"$(top_builddir)\"
+test_mail_key_CFLAGS = $(AM_CFLAGS) $(DOVECOT_BINARY_CFLAGS) -Dtop_builddir=\"$(top_builddir)\"
 
 noinst_HEADERS = \
        crypt-settings.h \
index dfe0b57ce9ae974e31c1bd91b27a62b7477f0353..083f735f17804f8d257866ad52bf7e0768354562 100644 (file)
@@ -74,7 +74,7 @@ pkginc_libdir = $(pkgincludedir)
 pkginc_lib_HEADERS = $(headers)
 
 if HAVE_LUA
-lib22_push_notification_lua_plugin_la_CFLAGS = $(AM_CPPFLAGS) \
+lib22_push_notification_lua_plugin_la_CFLAGS = $(AM_CFLAGS) \
        -I$(top_srcdir)/src/lib-lua \
        -I$(top_srcdir)/src/plugins/mail-lua \
        $(LUA_CFLAGS)