TS-1820 - Better fix for handling additional warning flags.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1d34e40e Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1d34e40e Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1d34e40e Branch: refs/heads/sphinx-docs Commit: 1d34e40e5ea1db645c8090289842bf8decb3fa17 Parents: ba1be0b Author: Alan M. Carroll <amc@chocobo.(none)> Authored: Thu Apr 25 18:17:16 2013 -0700 Committer: Alan M. Carroll <amc@chocobo.(none)> Committed: Thu Apr 25 18:17:16 2013 -0700 ---------------------------------------------------------------------- configure.ac | 8 +++++++- lib/cpp11api/Makefile.am | 2 +- lib/tsconfig/Makefile.am | 5 ++--- plugins/experimental/spdy/Makefile.am | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1d34e40e/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 0f955ae..5789276 100644 --- a/configure.ac +++ b/configure.ac @@ -728,7 +728,8 @@ case $host_os in *) # gcc # This is useful for finding odd conversions # common_opt="-pipe -Wall -Werror -Wconversion -Wno-sign-conversion" - common_opt="-pipe -Wall -Werror -Wunused-parameter" + ts_am_common_flags="-Wunused-parameter" + common_opt="-pipe -Wall -Werror" debug_opt="-ggdb3 $common_opt" release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing" cxx_opt="-Wno-invalid-offsetof" @@ -809,6 +810,11 @@ cc_oflag_dbg=$debug_opt cxx_oflag_opt="$release_opt $cxx_opt $cxx_rel" cxx_oflag_dbg="$debug_opt $cxx_opt $cxx_dbg" +AM_CFLAGS="$ts_am_common_flags" +AM_CXXFLAGS="$ts_am_common_flags" +AC_SUBST(AM_CFLAGS) +AC_SUBST(AM_CXXFLAGS) + AC_SUBST([FLEX_CFLAGS], $flex_cflags) SHARED_CFLAGS=-fPIC http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1d34e40e/lib/cpp11api/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/cpp11api/Makefile.am b/lib/cpp11api/Makefile.am index 3a5fde2..0aab9ed 100644 --- a/lib/cpp11api/Makefile.am +++ b/lib/cpp11api/Makefile.am @@ -23,7 +23,7 @@ AM_CPPFLAGS = -I$(top_builddir)/proxy/api/ts if BUILD_HAVE_CXX_11 if BUILD_HAVE_LIBCXX -AM_CXXFLAGS = -stdlib=libc++ +AM_CXXFLAGS += -stdlib=libc++ endif lib_LTLIBRARIES = libatscpp11api.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1d34e40e/lib/tsconfig/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/tsconfig/Makefile.am b/lib/tsconfig/Makefile.am index be89743..caa0392 100644 --- a/lib/tsconfig/Makefile.am +++ b/lib/tsconfig/Makefile.am @@ -19,13 +19,12 @@ lib_LTLIBRARIES = libtsconfig.la noinst_PROGRAMS = test-tsconfig libtsconfig_la_LDFLAGS = -no-undefined -version-info @TS_LIBTOOL_VERSION@ -CFLAGS = @CFLAGS@ @FLEX_CFLAGS@ +AM_CFLAGS += @FLEX_CFLAGS@ AM_YFLAGS = --yacc -d -p tsconfig AM_CPPFLAGS = \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/ts + -I$(top_srcdir)/lib BUILT_SOURCES = \ TsConfigGrammar.c TsConfigGrammar.h TsConfigGrammar.hpp \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1d34e40e/plugins/experimental/spdy/Makefile.am ---------------------------------------------------------------------- diff --git a/plugins/experimental/spdy/Makefile.am b/plugins/experimental/spdy/Makefile.am index 298d9f4..440a9f6 100644 --- a/plugins/experimental/spdy/Makefile.am +++ b/plugins/experimental/spdy/Makefile.am @@ -26,7 +26,7 @@ AM_CPPFLAGS += \ -I$(srcdir)/lib if BUILD_HAVE_LIBCXX -AM_CXXFLAGS = -stdlib=libc++ +AM_CXXFLAGS += -stdlib=libc++ endif spdy_la_SOURCES = \
