From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Sun, 9 Jan 2022 12:04:34 +0000 (+0000)
Subject: Add missing CXXFLAGS to several objects (#952)
X-Git-Tag: SQUID_6_0_1~255
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82fe21f;p=thirdparty%2Fsquid.git

Add missing CXXFLAGS to several objects (#952)

Target-specific CXXFLAGS customizations should include AM_CXXFLAGS.
Otherwise, their targets are built without SQUID_CXXFLAGS like -Wextra.
---

diff --git a/src/adaptation/ecap/Makefile.am b/src/adaptation/ecap/Makefile.am
index 7edda00d56..45f3302691 100644
--- a/src/adaptation/ecap/Makefile.am
+++ b/src/adaptation/ecap/Makefile.am
@@ -24,5 +24,7 @@ libecapsquid_la_SOURCES = \
 	XactionRep.h
 
 # add libecap using its pkg-config-produced configuration variables
-libecapsquid_la_CXXFLAGS = $(EXT_LIBECAP_CFLAGS)
+libecapsquid_la_CXXFLAGS = \
+	$(AM_CXXFLAGS) \
+	$(EXT_LIBECAP_CFLAGS)
 libecapsquid_la_LIBADD = $(EXT_LIBECAP_LIBS)
diff --git a/src/auth/basic/SMB/Makefile.am b/src/auth/basic/SMB/Makefile.am
index 10e41c8086..8458d61123 100644
--- a/src/auth/basic/SMB/Makefile.am
+++ b/src/auth/basic/SMB/Makefile.am
@@ -13,7 +13,9 @@ libexec_PROGRAMS = basic_smb_auth
 endif
 
 basic_smb_auth_SOURCES = basic_smb_auth.cc
-basic_smb_auth_CXXFLAGS = -DHELPERSCRIPT=\"$(libexecdir)/basic_smb_auth.sh\"
+basic_smb_auth_CXXFLAGS = \
+	$(AM_CXXFLAGS) \
+	-DHELPERSCRIPT=\"$(libexecdir)/basic_smb_auth.sh\"
 basic_smb_auth_LDADD = \
 	$(top_builddir)/lib/libmiscencoding.la \
 	$(COMPAT_LIB) \
diff --git a/src/auth/basic/SSPI/Makefile.am b/src/auth/basic/SSPI/Makefile.am
index 527e3ac66d..cfa2b4104d 100644
--- a/src/auth/basic/SSPI/Makefile.am
+++ b/src/auth/basic/SSPI/Makefile.am
@@ -15,7 +15,9 @@ basic_sspi_auth_SOURCES = \
 	basic_sspi_auth.cc \
 	valid.cc \
 	valid.h
-basic_sspi_auth_CXXFLAGS = -Wl,--enable-auto-import
+basic_sspi_auth_CXXFLAGS = \
+	$(AM_CXXFLAGS) \
+	-Wl,--enable-auto-import
 basic_sspi_auth_LDADD = \
 	$(top_builddir)/lib/libsspwin32.la \
 	$(top_builddir)/lib/libmiscencoding.la \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 0ae777d4a6..f1511417bc 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -88,7 +88,9 @@ nodist_cachemgr__CGIEXT__SOURCES = \
 	tests/stub_libmem.cc \
 	tests/STUB.h
 
-cachemgr__CGIEXT__CXXFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CXXFLAGS)
+cachemgr__CGIEXT__CXXFLAGS = \
+	$(AM_CXXFLAGS) \
+	-DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\"
 
 EXTRA_DIST += cachemgr.conf cachemgr.cgi.8 cachemgr.cgi.8.in
 CLEANFILES += cachemgr.cgi.8