Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
b20b6b50
Commit
b20b6b50
authored
Aug 12, 2014
by
Marcin Siodelski
Browse files
[3507] Renamed B10_CXXFLAGS to KEA_CXXFLAGS.
parent
962d0e13
Changes
47
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
b20b6b50
...
...
@@ -106,9 +106,9 @@ fi
AX_ISC_RPATH
# Compiler dependent settings: define some mandatory CXXFLAGS here.
# We also use a separate variable
B10
_CXXFLAGS. This will (and should) be
# We also use a separate variable
KEA
_CXXFLAGS. This will (and should) be
# used as the default value for each specific AM_CXXFLAGS:
# AM_CXXFLAGS = $(
B10
_CXXFLAGS)
# AM_CXXFLAGS = $(
KEA
_CXXFLAGS)
# AM_CXXFLAGS += ... # add module specific flags
# We need this so that we can disable some specific compiler warnings per
# module basis; since AM_CXXFLAGS are placed before CXXFLAGS, and since
...
...
@@ -155,7 +155,7 @@ fi
# on the source code.
if test "$CLANGPP" = "yes"; then
CXX_VERSION=`$CXX --version 2> /dev/null | head -1`
B10
_CXXFLAGS="$
B10
_CXXFLAGS -Qunused-arguments"
KEA
_CXXFLAGS="$
KEA
_CXXFLAGS -Qunused-arguments"
fi
KEA_CXX_TRY_FLAG([-Wno-missing-field-initializers],
...
...
@@ -165,12 +165,12 @@ AC_SUBST(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
# gcc specific settings:
if test "X$GXX" = "Xyes"; then
CXX_VERSION=`$CXX --version 2> /dev/null | head -1`
B10
_CXXFLAGS="$
B10
_CXXFLAGS -Wall -Wextra -Wnon-virtual-dtor -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare"
KEA
_CXXFLAGS="$
KEA
_CXXFLAGS -Wall -Wextra -Wnon-virtual-dtor -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare"
case "$host" in
*-solaris*)
MULTITHREADING_FLAG=-pthreads
# In Solaris, IN6ADDR_ANY_INIT and IN6ADDR_LOOPBACK_INIT need -Wno-missing-braces
B10
_CXXFLAGS="$
B10
_CXXFLAGS -Wno-missing-braces"
KEA
_CXXFLAGS="$
KEA
_CXXFLAGS -Wno-missing-braces"
;;
*)
MULTITHREADING_FLAG=-pthread
...
...
@@ -195,7 +195,7 @@ werror_ok=0
# translation unit. For these versions we have to disable -Werror.
if test $with_werror = 1; then
CXXFLAGS_SAVED="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $
B10
_CXXFLAGS -Werror"
CXXFLAGS="$CXXFLAGS $
KEA
_CXXFLAGS -Werror"
AC_MSG_CHECKING(for in-TU anonymous namespace breakage)
# We use struct, not class, here, because some compilers complain about
# "unused private members", causing a false positive.
...
...
@@ -203,7 +203,7 @@ if test $with_werror = 1; then
namespace isc {struct Bar {Foo foo_;};} ],,
[AC_MSG_RESULT(no)
werror_ok=1
B10
_CXXFLAGS="$
B10
_CXXFLAGS -Werror"],
KEA
_CXXFLAGS="$
KEA
_CXXFLAGS -Werror"],
[AC_MSG_RESULT(yes)])
CXXFLAGS="$CXXFLAGS_SAVED"
fi
...
...
@@ -341,10 +341,10 @@ fi
# produce PIC unless we disable shared libraries. need this for python bindings.
if test $enable_shared != "no" -a "X$GXX" = "Xyes"; then
B10
_CXXFLAGS="$
B10
_CXXFLAGS -fPIC"
KEA
_CXXFLAGS="$
KEA
_CXXFLAGS -fPIC"
fi
AC_SUBST(
B10
_CXXFLAGS)
AC_SUBST(
KEA
_CXXFLAGS)
# Checks for libraries.
...
...
@@ -1518,7 +1518,7 @@ C++ Compiler:
CPPFLAGS: ${CPPFLAGS}
CXXFLAGS: ${CXXFLAGS}
LDFLAGS: ${LDFLAGS}
B10
_CXXFLAGS: ${
B10
_CXXFLAGS}
KEA
_CXXFLAGS: ${
KEA
_CXXFLAGS}
END
if test "$PYTHON" != "no" ; then
...
...
src/bin/d2/Makefile.am
View file @
b20b6b50
...
...
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS
+=
-I
$(top_srcdir)
/src/bin
-I
$(top_builddir)
/src/bin
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
if
USE_CLANGPP
# Disable unused parameter warning caused by some Boost headers when compiling with clang
AM_CXXFLAGS
+=
-Wno-unused-parameter
...
...
src/bin/d2/tests/Makefile.am
View file @
b20b6b50
...
...
@@ -32,7 +32,7 @@ CLEANFILES = $(builddir)/interfaces.txt $(builddir)/logger_lockfile
DISTCLEANFILES
=
d2_process_tests.sh
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
if
USE_CLANGPP
# Disable unused parameter warning caused by some Boost headers when compiling with clang
AM_CXXFLAGS
+=
-Wno-unused-parameter
...
...
src/bin/dhcp4/Makefile.am
View file @
b20b6b50
...
...
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS
+=
-I
$(top_srcdir)
/src/bin
-I
$(top_builddir)
/src/bin
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
if
USE_CLANGPP
# Disable unused parameter warning caused by some Boost headers when compiling with clang
AM_CXXFLAGS
+=
-Wno-unused-parameter
...
...
src/bin/dhcp4/tests/Makefile.am
View file @
b20b6b50
...
...
@@ -33,7 +33,7 @@ CLEANFILES += *.json *.log
DISTCLEANFILES
=
dhcp4_process_tests.sh
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
if
USE_CLANGPP
# Disable unused parameter warning caused by some Boost headers when compiling with clang
AM_CXXFLAGS
+=
-Wno-unused-parameter
...
...
src/bin/dhcp6/Makefile.am
View file @
b20b6b50
...
...
@@ -5,7 +5,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
AM_CPPFLAGS
+=
-I
$(top_srcdir)
/src/lib/cc
-I
$(top_builddir)
/src/lib/cc
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
if
USE_CLANGPP
# Disable unused parameter warning caused by some Boost headers when compiling with clang
AM_CXXFLAGS
+=
-Wno-unused-parameter
...
...
src/bin/dhcp6/tests/Makefile.am
View file @
b20b6b50
...
...
@@ -31,7 +31,7 @@ CLEANFILES += *.json *.log
DISTCLEANFILES
=
dhcp6_process_tests.sh
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
if
USE_CLANGPP
# Disable unused parameter warning caused by some Boost headers when compiling with clang
AM_CXXFLAGS
+=
-Wno-unused-parameter
...
...
src/bin/perfdhcp/Makefile.am
View file @
b20b6b50
...
...
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS
+=
-I
$(top_srcdir)
/src/lib/log
-I
$(top_builddir)
/src/lib/log
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
# Some versions of GCC warn about some versions of Boost regarding
# missing initializer for members in its posix_time.
...
...
src/bin/perfdhcp/tests/Makefile.am
View file @
b20b6b50
...
...
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS
+=
-I
$(srcdir)
/..
-I
$(builddir)
/..
AM_CPPFLAGS
+=
-DTEST_DATA_DIR
=
\"
$(abs_srcdir)
/testdata
\"
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
if
USE_STATIC_LINK
AM_LDFLAGS
=
-static
...
...
src/bin/sockcreator/Makefile.am
View file @
b20b6b50
...
...
@@ -2,7 +2,7 @@ SUBDIRS = . tests
AM_CPPFLAGS
=
-I
$(top_srcdir)
/src/lib
-I
$(top_builddir)
/src/lib
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
if
USE_STATIC_LINK
AM_LDFLAGS
=
-static
...
...
src/bin/sockcreator/tests/Makefile.am
View file @
b20b6b50
...
...
@@ -2,7 +2,7 @@ CLEANFILES = *.gcno *.gcda
AM_CPPFLAGS
=
-I
$(top_srcdir)
/src/lib
-I
$(top_builddir)
/src/lib
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
if
USE_STATIC_LINK
AM_LDFLAGS
=
-static
...
...
src/hooks/dhcp/user_chk/Makefile.am
View file @
b20b6b50
...
...
@@ -2,7 +2,7 @@ SUBDIRS = . tests
AM_CPPFLAGS
=
-I
$(top_builddir)
/src/lib
-I
$(top_srcdir)
/src/lib
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
# Some versions of GCC warn about some versions of Boost regarding
# missing initializer for members in its posix_time.
...
...
src/hooks/dhcp/user_chk/tests/Makefile.am
View file @
b20b6b50
...
...
@@ -6,7 +6,7 @@ AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
AM_CPPFLAGS
+=
-DTEST_DATA_BUILDDIR
=
\"
$(abs_top_srcdir)
/src/hooks/dhcp/user_chk/tests
\"
AM_CPPFLAGS
+=
-DINSTALL_PROG
=
\"
$(abs_top_srcdir)
/install-sh
\"
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
# Some versions of GCC warn about some versions of Boost regarding
# missing initializer for members in its posix_time.
...
...
src/lib/asiodns/Makefile.am
View file @
b20b6b50
...
...
@@ -6,7 +6,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns
AM_CPPFLAGS
+=
-I
$(top_srcdir)
/src/lib/asiolink
-I
$(top_builddir)
/src/lib/asiolink
AM_CPPFLAGS
+=
-I
$(top_srcdir)
/src/lib/util
-I
$(top_builddir)
/src/lib/util
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
CLEANFILES
=
*
.gcno
*
.gcda asiodns_messages.h asiodns_messages.cc s-messages
...
...
@@ -36,7 +36,7 @@ nodist_libkea_asiodns_la_SOURCES = asiodns_messages.cc asiodns_messages.h
EXTRA_DIST
=
asiodns_messages.mes
# Note: the ordering matters: -Wno-... must follow -Wextra (defined in
#
B10
_CXXFLAGS)
#
KEA
_CXXFLAGS)
libkea_asiodns_la_CXXFLAGS
=
$(AM_CXXFLAGS)
libkea_asiodns_la_CPPFLAGS
=
$(AM_CPPFLAGS)
libkea_asiodns_la_LIBADD
=
$(top_builddir)
/src/lib/asiolink/libkea-asiolink.la
...
...
src/lib/asiodns/tests/Makefile.am
View file @
b20b6b50
...
...
@@ -4,7 +4,7 @@ AM_CPPFLAGS += -I$(top_builddir)/src/lib/dns -I$(top_srcdir)/src/bin
AM_CPPFLAGS
+=
-I
$(top_builddir)
/src/lib/cc
-I
$(top_builddir)
/src/lib/util
AM_CPPFLAGS
+=
-DTEST_DATA_DIR
=
\"
$(srcdir)
/testdata
\"
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
if
USE_STATIC_LINK
AM_LDFLAGS
=
-static
...
...
@@ -39,7 +39,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
# Note: the ordering matters: -Wno-... must follow -Wextra (defined in
#
B10
_CXXFLAGS)
#
KEA
_CXXFLAGS)
run_unittests_CXXFLAGS
=
$(AM_CXXFLAGS)
if
USE_GXX
run_unittests_CXXFLAGS
+=
-Wno-unused-parameter
...
...
src/lib/asiolink/Makefile.am
View file @
b20b6b50
...
...
@@ -3,7 +3,7 @@ SUBDIRS = . tests
AM_CPPFLAGS
=
-I
$(top_srcdir)
/src/lib
-I
$(top_builddir)
/src/lib
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
CLEANFILES
=
*
.gcno
*
.gcda
...
...
@@ -35,7 +35,7 @@ libkea_asiolink_la_SOURCES += udp_socket.h
libkea_asiolink_la_SOURCES
+=
local_socket.h local_socket.cc
# Note: the ordering matters: -Wno-... must follow -Wextra (defined in
#
B10
_CXXFLAGS)
#
KEA
_CXXFLAGS)
libkea_asiolink_la_CXXFLAGS
=
$(AM_CXXFLAGS)
libkea_asiolink_la_CPPFLAGS
=
$(AM_CPPFLAGS)
libkea_asiolink_la_LIBADD
=
$(top_builddir)
/src/lib/exceptions/libkea-exceptions.la
...
...
src/lib/asiolink/tests/Makefile.am
View file @
b20b6b50
...
...
@@ -4,7 +4,7 @@ AM_CPPFLAGS += -I$(top_builddir)/src/lib/util -I$(top_srcdir)/src/util
AM_CPPFLAGS
+=
-I
$(top_builddir)
/src/lib/cc
AM_CPPFLAGS
+=
-DTEST_DATA_DIR
=
\"
$(srcdir)
/testdata
\"
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
if
USE_STATIC_LINK
AM_LDFLAGS
=
-static
...
...
@@ -48,7 +48,7 @@ run_unittests_LDADD += $(GTEST_LDADD)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
# Note: the ordering matters: -Wno-... must follow -Wextra (defined in
#
B10
_CXXFLAGS)
#
KEA
_CXXFLAGS)
run_unittests_CXXFLAGS
=
$(AM_CXXFLAGS)
if
USE_GXX
run_unittests_CXXFLAGS
+=
-Wno-unused-parameter
...
...
src/lib/cc/Makefile.am
View file @
b20b6b50
...
...
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
AM_CPPFLAGS
+=
-I
$(top_srcdir)
/src/lib/dns
-I
$(top_builddir)
/src/lib/dns
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
if
USE_GXX
# ASIO header files used in session.cc will trigger the "unused-parameter"
# warning. Unfortunately there doesn't seem to be an easy way to selectively
...
...
src/lib/cc/tests/Makefile.am
View file @
b20b6b50
...
...
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
AM_CPPFLAGS
+=
-I
$(top_srcdir)
/src/lib/dns
-I
$(top_builddir)
/src/lib/dns
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
if USE_GXX #XXX
:
see ../Makefile.am
AM_CXXFLAGS
+=
-Wno-unused-parameter
endif
...
...
src/lib/config/tests/Makefile.am
View file @
b20b6b50
...
...
@@ -3,7 +3,7 @@ SUBDIRS = testdata .
AM_CPPFLAGS
=
-I
$(top_builddir)
/src/lib
-I
$(top_srcdir)
/src/lib
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
AM_CXXFLAGS
=
$(
B10
_CXXFLAGS)
AM_CXXFLAGS
=
$(
KEA
_CXXFLAGS)
if
USE_STATIC_LINK
AM_LDFLAGS
=
-static
...
...
Prev
1
2
3
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment