Commit b20b6b50 authored by Marcin Siodelski's avatar Marcin Siodelski

[3507] Renamed B10_CXXFLAGS to KEA_CXXFLAGS.

parent 962d0e13
...@@ -106,9 +106,9 @@ fi ...@@ -106,9 +106,9 @@ fi
AX_ISC_RPATH AX_ISC_RPATH
# Compiler dependent settings: define some mandatory CXXFLAGS here. # 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: # used as the default value for each specific AM_CXXFLAGS:
# AM_CXXFLAGS = $(B10_CXXFLAGS) # AM_CXXFLAGS = $(KEA_CXXFLAGS)
# AM_CXXFLAGS += ... # add module specific flags # AM_CXXFLAGS += ... # add module specific flags
# We need this so that we can disable some specific compiler warnings per # We need this so that we can disable some specific compiler warnings per
# module basis; since AM_CXXFLAGS are placed before CXXFLAGS, and since # module basis; since AM_CXXFLAGS are placed before CXXFLAGS, and since
...@@ -155,7 +155,7 @@ fi ...@@ -155,7 +155,7 @@ fi
# on the source code. # on the source code.
if test "$CLANGPP" = "yes"; then if test "$CLANGPP" = "yes"; then
CXX_VERSION=`$CXX --version 2> /dev/null | head -1` CXX_VERSION=`$CXX --version 2> /dev/null | head -1`
B10_CXXFLAGS="$B10_CXXFLAGS -Qunused-arguments" KEA_CXXFLAGS="$KEA_CXXFLAGS -Qunused-arguments"
fi fi
KEA_CXX_TRY_FLAG([-Wno-missing-field-initializers], KEA_CXX_TRY_FLAG([-Wno-missing-field-initializers],
...@@ -165,12 +165,12 @@ AC_SUBST(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG) ...@@ -165,12 +165,12 @@ AC_SUBST(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
# gcc specific settings: # gcc specific settings:
if test "X$GXX" = "Xyes"; then if test "X$GXX" = "Xyes"; then
CXX_VERSION=`$CXX --version 2> /dev/null | head -1` 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 case "$host" in
*-solaris*) *-solaris*)
MULTITHREADING_FLAG=-pthreads MULTITHREADING_FLAG=-pthreads
# In Solaris, IN6ADDR_ANY_INIT and IN6ADDR_LOOPBACK_INIT need -Wno-missing-braces # 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 MULTITHREADING_FLAG=-pthread
...@@ -195,7 +195,7 @@ werror_ok=0 ...@@ -195,7 +195,7 @@ werror_ok=0
# translation unit. For these versions we have to disable -Werror. # translation unit. For these versions we have to disable -Werror.
if test $with_werror = 1; then if test $with_werror = 1; then
CXXFLAGS_SAVED="$CXXFLAGS" CXXFLAGS_SAVED="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $B10_CXXFLAGS -Werror" CXXFLAGS="$CXXFLAGS $KEA_CXXFLAGS -Werror"
AC_MSG_CHECKING(for in-TU anonymous namespace breakage) AC_MSG_CHECKING(for in-TU anonymous namespace breakage)
# We use struct, not class, here, because some compilers complain about # We use struct, not class, here, because some compilers complain about
# "unused private members", causing a false positive. # "unused private members", causing a false positive.
...@@ -203,7 +203,7 @@ if test $with_werror = 1; then ...@@ -203,7 +203,7 @@ if test $with_werror = 1; then
namespace isc {struct Bar {Foo foo_;};} ],, namespace isc {struct Bar {Foo foo_;};} ],,
[AC_MSG_RESULT(no) [AC_MSG_RESULT(no)
werror_ok=1 werror_ok=1
B10_CXXFLAGS="$B10_CXXFLAGS -Werror"], KEA_CXXFLAGS="$KEA_CXXFLAGS -Werror"],
[AC_MSG_RESULT(yes)]) [AC_MSG_RESULT(yes)])
CXXFLAGS="$CXXFLAGS_SAVED" CXXFLAGS="$CXXFLAGS_SAVED"
fi fi
...@@ -341,10 +341,10 @@ fi ...@@ -341,10 +341,10 @@ fi
# produce PIC unless we disable shared libraries. need this for python bindings. # produce PIC unless we disable shared libraries. need this for python bindings.
if test $enable_shared != "no" -a "X$GXX" = "Xyes"; then if test $enable_shared != "no" -a "X$GXX" = "Xyes"; then
B10_CXXFLAGS="$B10_CXXFLAGS -fPIC" KEA_CXXFLAGS="$KEA_CXXFLAGS -fPIC"
fi fi
AC_SUBST(B10_CXXFLAGS) AC_SUBST(KEA_CXXFLAGS)
# Checks for libraries. # Checks for libraries.
...@@ -1518,7 +1518,7 @@ C++ Compiler: ...@@ -1518,7 +1518,7 @@ C++ Compiler:
CPPFLAGS: ${CPPFLAGS} CPPFLAGS: ${CPPFLAGS}
CXXFLAGS: ${CXXFLAGS} CXXFLAGS: ${CXXFLAGS}
LDFLAGS: ${LDFLAGS} LDFLAGS: ${LDFLAGS}
B10_CXXFLAGS: ${B10_CXXFLAGS} KEA_CXXFLAGS: ${KEA_CXXFLAGS}
END END
if test "$PYTHON" != "no" ; then if test "$PYTHON" != "no" ; then
......
...@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib ...@@ -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 += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_CLANGPP if USE_CLANGPP
# Disable unused parameter warning caused by some Boost headers when compiling with clang # Disable unused parameter warning caused by some Boost headers when compiling with clang
AM_CXXFLAGS += -Wno-unused-parameter AM_CXXFLAGS += -Wno-unused-parameter
......
...@@ -32,7 +32,7 @@ CLEANFILES = $(builddir)/interfaces.txt $(builddir)/logger_lockfile ...@@ -32,7 +32,7 @@ CLEANFILES = $(builddir)/interfaces.txt $(builddir)/logger_lockfile
DISTCLEANFILES = d2_process_tests.sh DISTCLEANFILES = d2_process_tests.sh
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_CLANGPP if USE_CLANGPP
# Disable unused parameter warning caused by some Boost headers when compiling with clang # Disable unused parameter warning caused by some Boost headers when compiling with clang
AM_CXXFLAGS += -Wno-unused-parameter AM_CXXFLAGS += -Wno-unused-parameter
......
...@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib ...@@ -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 += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_CLANGPP if USE_CLANGPP
# Disable unused parameter warning caused by some Boost headers when compiling with clang # Disable unused parameter warning caused by some Boost headers when compiling with clang
AM_CXXFLAGS += -Wno-unused-parameter AM_CXXFLAGS += -Wno-unused-parameter
......
...@@ -33,7 +33,7 @@ CLEANFILES += *.json *.log ...@@ -33,7 +33,7 @@ CLEANFILES += *.json *.log
DISTCLEANFILES = dhcp4_process_tests.sh DISTCLEANFILES = dhcp4_process_tests.sh
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_CLANGPP if USE_CLANGPP
# Disable unused parameter warning caused by some Boost headers when compiling with clang # Disable unused parameter warning caused by some Boost headers when compiling with clang
AM_CXXFLAGS += -Wno-unused-parameter AM_CXXFLAGS += -Wno-unused-parameter
......
...@@ -5,7 +5,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin ...@@ -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 += -I$(top_srcdir)/src/lib/cc -I$(top_builddir)/src/lib/cc
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_CLANGPP if USE_CLANGPP
# Disable unused parameter warning caused by some Boost headers when compiling with clang # Disable unused parameter warning caused by some Boost headers when compiling with clang
AM_CXXFLAGS += -Wno-unused-parameter AM_CXXFLAGS += -Wno-unused-parameter
......
...@@ -31,7 +31,7 @@ CLEANFILES += *.json *.log ...@@ -31,7 +31,7 @@ CLEANFILES += *.json *.log
DISTCLEANFILES = dhcp6_process_tests.sh DISTCLEANFILES = dhcp6_process_tests.sh
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_CLANGPP if USE_CLANGPP
# Disable unused parameter warning caused by some Boost headers when compiling with clang # Disable unused parameter warning caused by some Boost headers when compiling with clang
AM_CXXFLAGS += -Wno-unused-parameter AM_CXXFLAGS += -Wno-unused-parameter
......
...@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib ...@@ -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 += -I$(top_srcdir)/src/lib/log -I$(top_builddir)/src/lib/log
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
# Some versions of GCC warn about some versions of Boost regarding # Some versions of GCC warn about some versions of Boost regarding
# missing initializer for members in its posix_time. # missing initializer for members in its posix_time.
......
...@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib ...@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += -I$(srcdir)/.. -I$(builddir)/.. AM_CPPFLAGS += -I$(srcdir)/.. -I$(builddir)/..
AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_srcdir)/testdata\" AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_srcdir)/testdata\"
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_STATIC_LINK if USE_STATIC_LINK
AM_LDFLAGS = -static AM_LDFLAGS = -static
......
...@@ -2,7 +2,7 @@ SUBDIRS = . tests ...@@ -2,7 +2,7 @@ SUBDIRS = . tests
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_STATIC_LINK if USE_STATIC_LINK
AM_LDFLAGS = -static AM_LDFLAGS = -static
......
...@@ -2,7 +2,7 @@ CLEANFILES = *.gcno *.gcda ...@@ -2,7 +2,7 @@ CLEANFILES = *.gcno *.gcda
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_STATIC_LINK if USE_STATIC_LINK
AM_LDFLAGS = -static AM_LDFLAGS = -static
......
...@@ -2,7 +2,7 @@ SUBDIRS = . tests ...@@ -2,7 +2,7 @@ SUBDIRS = . tests
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
# Some versions of GCC warn about some versions of Boost regarding # Some versions of GCC warn about some versions of Boost regarding
# missing initializer for members in its posix_time. # missing initializer for members in its posix_time.
......
...@@ -6,7 +6,7 @@ AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES) ...@@ -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 += -DTEST_DATA_BUILDDIR=\"$(abs_top_srcdir)/src/hooks/dhcp/user_chk/tests\"
AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\" 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 # Some versions of GCC warn about some versions of Boost regarding
# missing initializer for members in its posix_time. # missing initializer for members in its posix_time.
......
...@@ -6,7 +6,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns ...@@ -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/asiolink -I$(top_builddir)/src/lib/asiolink
AM_CPPFLAGS += -I$(top_srcdir)/src/lib/util -I$(top_builddir)/src/lib/util 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 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 ...@@ -36,7 +36,7 @@ nodist_libkea_asiodns_la_SOURCES = asiodns_messages.cc asiodns_messages.h
EXTRA_DIST = asiodns_messages.mes EXTRA_DIST = asiodns_messages.mes
# Note: the ordering matters: -Wno-... must follow -Wextra (defined in # Note: the ordering matters: -Wno-... must follow -Wextra (defined in
# B10_CXXFLAGS) # KEA_CXXFLAGS)
libkea_asiodns_la_CXXFLAGS = $(AM_CXXFLAGS) libkea_asiodns_la_CXXFLAGS = $(AM_CXXFLAGS)
libkea_asiodns_la_CPPFLAGS = $(AM_CPPFLAGS) libkea_asiodns_la_CPPFLAGS = $(AM_CPPFLAGS)
libkea_asiodns_la_LIBADD = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libkea_asiodns_la_LIBADD = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
......
...@@ -4,7 +4,7 @@ AM_CPPFLAGS += -I$(top_builddir)/src/lib/dns -I$(top_srcdir)/src/bin ...@@ -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 += -I$(top_builddir)/src/lib/cc -I$(top_builddir)/src/lib/util
AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(srcdir)/testdata\" AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(srcdir)/testdata\"
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_STATIC_LINK if USE_STATIC_LINK
AM_LDFLAGS = -static AM_LDFLAGS = -static
...@@ -39,7 +39,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la ...@@ -39,7 +39,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
# Note: the ordering matters: -Wno-... must follow -Wextra (defined in # Note: the ordering matters: -Wno-... must follow -Wextra (defined in
# B10_CXXFLAGS) # KEA_CXXFLAGS)
run_unittests_CXXFLAGS = $(AM_CXXFLAGS) run_unittests_CXXFLAGS = $(AM_CXXFLAGS)
if USE_GXX if USE_GXX
run_unittests_CXXFLAGS += -Wno-unused-parameter run_unittests_CXXFLAGS += -Wno-unused-parameter
......
...@@ -3,7 +3,7 @@ SUBDIRS = . tests ...@@ -3,7 +3,7 @@ SUBDIRS = . tests
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
CLEANFILES = *.gcno *.gcda CLEANFILES = *.gcno *.gcda
...@@ -35,7 +35,7 @@ libkea_asiolink_la_SOURCES += udp_socket.h ...@@ -35,7 +35,7 @@ libkea_asiolink_la_SOURCES += udp_socket.h
libkea_asiolink_la_SOURCES += local_socket.h local_socket.cc libkea_asiolink_la_SOURCES += local_socket.h local_socket.cc
# Note: the ordering matters: -Wno-... must follow -Wextra (defined in # Note: the ordering matters: -Wno-... must follow -Wextra (defined in
# B10_CXXFLAGS) # KEA_CXXFLAGS)
libkea_asiolink_la_CXXFLAGS = $(AM_CXXFLAGS) libkea_asiolink_la_CXXFLAGS = $(AM_CXXFLAGS)
libkea_asiolink_la_CPPFLAGS = $(AM_CPPFLAGS) libkea_asiolink_la_CPPFLAGS = $(AM_CPPFLAGS)
libkea_asiolink_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_asiolink_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
......
...@@ -4,7 +4,7 @@ AM_CPPFLAGS += -I$(top_builddir)/src/lib/util -I$(top_srcdir)/src/util ...@@ -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 += -I$(top_builddir)/src/lib/cc
AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(srcdir)/testdata\" AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(srcdir)/testdata\"
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_STATIC_LINK if USE_STATIC_LINK
AM_LDFLAGS = -static AM_LDFLAGS = -static
...@@ -48,7 +48,7 @@ run_unittests_LDADD += $(GTEST_LDADD) ...@@ -48,7 +48,7 @@ run_unittests_LDADD += $(GTEST_LDADD)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
# Note: the ordering matters: -Wno-... must follow -Wextra (defined in # Note: the ordering matters: -Wno-... must follow -Wextra (defined in
# B10_CXXFLAGS) # KEA_CXXFLAGS)
run_unittests_CXXFLAGS = $(AM_CXXFLAGS) run_unittests_CXXFLAGS = $(AM_CXXFLAGS)
if USE_GXX if USE_GXX
run_unittests_CXXFLAGS += -Wno-unused-parameter run_unittests_CXXFLAGS += -Wno-unused-parameter
......
...@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib ...@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns 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 if USE_GXX
# ASIO header files used in session.cc will trigger the "unused-parameter" # 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 # warning. Unfortunately there doesn't seem to be an easy way to selectively
......
...@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib ...@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns 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 if USE_GXX #XXX: see ../Makefile.am
AM_CXXFLAGS += -Wno-unused-parameter AM_CXXFLAGS += -Wno-unused-parameter
endif endif
......
...@@ -3,7 +3,7 @@ SUBDIRS = testdata . ...@@ -3,7 +3,7 @@ SUBDIRS = testdata .
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_STATIC_LINK if USE_STATIC_LINK
AM_LDFLAGS = -static AM_LDFLAGS = -static
......
...@@ -2,7 +2,7 @@ SUBDIRS = . tests ...@@ -2,7 +2,7 @@ SUBDIRS = . tests
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
CLEANFILES = *.gcno *.gcda CLEANFILES = *.gcno *.gcda
......
...@@ -2,7 +2,7 @@ SUBDIRS = . ...@@ -2,7 +2,7 @@ SUBDIRS = .
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_STATIC_LINK if USE_STATIC_LINK
AM_LDFLAGS = -static AM_LDFLAGS = -static
......
...@@ -2,7 +2,7 @@ SUBDIRS = . tests ...@@ -2,7 +2,7 @@ SUBDIRS = . tests
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
# Some versions of GCC warn about some versions of Boost regarding # Some versions of GCC warn about some versions of Boost regarding
# missing initializer for members in its posix_time. # missing initializer for members in its posix_time.
......
...@@ -5,7 +5,7 @@ AM_CPPFLAGS += $(BOOST_INCLUDES) ...@@ -5,7 +5,7 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/dhcp/tests\" AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/dhcp/tests\"
AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\" 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 # Some versions of GCC warn about some versions of Boost regarding
# missing initializer for members in its posix_time. # missing initializer for members in its posix_time.
......
...@@ -2,7 +2,7 @@ SUBDIRS = . tests ...@@ -2,7 +2,7 @@ SUBDIRS = . tests
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
# Some versions of GCC warn about some versions of Boost regarding # Some versions of GCC warn about some versions of Boost regarding
# missing initializer for members in its posix_time. # missing initializer for members in its posix_time.
......
...@@ -5,7 +5,7 @@ AM_CPPFLAGS += $(BOOST_INCLUDES) ...@@ -5,7 +5,7 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/dhcp_ddns/tests\" AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/dhcp_ddns/tests\"
AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\" 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 # Some versions of GCC warn about some versions of Boost regarding
# missing initializer for members in its posix_time. # missing initializer for members in its posix_time.
......
...@@ -12,7 +12,7 @@ if HAVE_PGSQL ...@@ -12,7 +12,7 @@ if HAVE_PGSQL
AM_CPPFLAGS += $(PGSQL_CPPFLAGS) AM_CPPFLAGS += $(PGSQL_CPPFLAGS)
endif endif
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
# Define rule to build logging source files from message file # Define rule to build logging source files from message file
dhcpsrv_messages.h dhcpsrv_messages.cc: s-messages dhcpsrv_messages.h dhcpsrv_messages.cc: s-messages
......
...@@ -6,7 +6,7 @@ AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/dhcpsrv/tests\ ...@@ -6,7 +6,7 @@ AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/dhcpsrv/tests\
AM_CPPFLAGS += -DDHCP_DATA_DIR=\"$(abs_top_builddir)/src/lib/dhcpsrv/tests\" AM_CPPFLAGS += -DDHCP_DATA_DIR=\"$(abs_top_builddir)/src/lib/dhcpsrv/tests\"
AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\" 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 # Some versions of GCC warn about some versions of Boost regarding
# missing initializer for members in its posix_time. # missing initializer for members in its posix_time.
......
...@@ -3,7 +3,7 @@ SUBDIRS = . ...@@ -3,7 +3,7 @@ SUBDIRS = .
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_STATIC_LINK if USE_STATIC_LINK
AM_LDFLAGS = -static AM_LDFLAGS = -static
......
...@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib ...@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns
AM_CPPFLAGS += -I$(top_srcdir)/src/lib/util -I$(top_builddir)/src/lib/util AM_CPPFLAGS += -I$(top_srcdir)/src/lib/util -I$(top_builddir)/src/lib/util
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
CLEANFILES = *.gcno *.gcda CLEANFILES = *.gcno *.gcda
CLEANFILES += s-rdatacode CLEANFILES += s-rdatacode
......
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_STATIC_LINK if USE_STATIC_LINK
AM_LDFLAGS = -static AM_LDFLAGS = -static
......
...@@ -6,7 +6,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns ...@@ -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/util -I$(top_builddir)/src/lib/util AM_CPPFLAGS += -I$(top_srcdir)/src/lib/util -I$(top_builddir)/src/lib/util
AM_CPPFLAGS += -DTEST_DATA_SRCDIR=\"$(abs_top_srcdir)/src/lib/dns/tests/testdata\" AM_CPPFLAGS += -DTEST_DATA_SRCDIR=\"$(abs_top_srcdir)/src/lib/dns/tests/testdata\"
AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/dns/tests/testdata\" AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/dns/tests/testdata\"
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_STATIC_LINK if USE_STATIC_LINK
AM_LDFLAGS = -static AM_LDFLAGS = -static
......
SUBDIRS = . tests SUBDIRS = . tests
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CXXFLAGS=$(B10_CXXFLAGS) AM_CXXFLAGS=$(KEA_CXXFLAGS)
lib_LTLIBRARIES = libkea-exceptions.la lib_LTLIBRARIES = libkea-exceptions.la
libkea_exceptions_la_SOURCES = exceptions.h exceptions.cc libkea_exceptions_la_SOURCES = exceptions.h exceptions.cc
......
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns
AM_CXXFLAGS = $(B10_CXXFLAGS) AM_CXXFLAGS = $(KEA_CXXFLAGS)
if USE_STATIC_LINK if USE_STATIC_LINK
AM_LDFLAGS = -static AM_LDFLAGS = -static
......
...@@ -2,7 +2,7 @@ SUBDIRS = . tests ...@@ -2,7 +2,7 @@ SUBDIRS = . tests
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS)