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 7edda00d56c03a1f8e2610d5d86f2b09bdaa2a3c..45f3302691ac7fc0eeaa857b966430983cfa9af7 100644 (file)
--- 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 10e41c8086dbb96107a65720c1bdbab2f7208d7b..8458d611232d5836b65dee6692d5f43df27d4ccf 100644 (file)
--- 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 527e3ac66d402cec6208d9d4f8ed714e3c7715fc..cfa2b4104d6b2ab8d468b83943889f797baab4a0 100644 (file)
--- 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 0ae777d4a6ceb70ac3694d56f868400999a42d24..f1511417bc4f196266552f3f631fa890609e0dae 100644 (file)
--- 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