Skip to content
GitLab
Projects
Groups
Snippets
/
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
862e13c5
Commit
862e13c5
authored
May 20, 2011
by
Stephen Morris
Browse files
[trac899] Update Makefiles to include log4cplus library in link
parent
ee0e702f
Changes
16
Hide whitespace changes
Inline
Side-by-side
src/bin/auth/Makefile.am
View file @
862e13c5
...
...
@@ -55,6 +55,7 @@ b10_auth_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
b10_auth_LDADD
+=
$(top_builddir)
/src/lib/xfr/libxfr.la
b10_auth_LDADD
+=
$(top_builddir)
/src/lib/server_common/libserver_common.la
b10_auth_LDADD
+=
$(SQLITE_LIBS)
b10_auth_LDFLAGS
=
$(LOG4CPLUS_LDFLAGS)
# TODO: config.h.in is wrong because doesn't honor pkgdatadir
# and can't use @datadir@ because doesn't expand default ${prefix}
...
...
src/bin/auth/benchmarks/Makefile.am
View file @
862e13c5
...
...
@@ -26,3 +26,6 @@ query_bench_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
query_bench_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libasiolink.la
query_bench_LDADD
+=
$(top_builddir)
/src/lib/server_common/libserver_common.la
query_bench_LDADD
+=
$(SQLITE_LIBS)
query_bench_LDFLAGS
=
$(LOG4CPLUS_LDFLAGS)
src/bin/auth/tests/Makefile.am
View file @
862e13c5
...
...
@@ -37,7 +37,7 @@ run_unittests_SOURCES += change_user_unittest.cc
run_unittests_SOURCES
+=
statistics_unittest.cc
run_unittests_SOURCES
+=
run_unittests.cc
run_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
$(LOG4CPLUS_LDFLAGS)
run_unittests_LDADD
=
$(GTEST_LDADD)
run_unittests_LDADD
+=
$(SQLITE_LIBS)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/testutils/libtestutils.la
...
...
src/bin/resolver/Makefile.am
View file @
862e13c5
...
...
@@ -56,7 +56,7 @@ b10_resolver_LDADD += $(top_builddir)/src/lib/cache/libcache.la
b10_resolver_LDADD
+=
$(top_builddir)
/src/lib/nsas/libnsas.la
b10_resolver_LDADD
+=
$(top_builddir)
/src/lib/resolve/libresolve.la
b10_resolver_LDADD
+=
$(top_builddir)
/src/bin/auth/change_user.o
b10_resolver_LDFLAGS
=
-pthread
b10_resolver_LDFLAGS
=
-pthread
$(LOG4CPLUS_LDFLAGS)
# TODO: config.h.in is wrong because doesn't honor pkgdatadir
# and can't use @datadir@ because doesn't expand default ${prefix}
...
...
src/bin/resolver/tests/Makefile.am
View file @
862e13c5
...
...
@@ -25,7 +25,7 @@ run_unittests_SOURCES += resolver_config_unittest.cc
run_unittests_SOURCES
+=
response_scrubber_unittest.cc
run_unittests_SOURCES
+=
run_unittests.cc
run_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
$(LOG4CPLUS_LDFLAGS)
run_unittests_LDADD
=
$(GTEST_LDADD)
run_unittests_LDADD
+=
$(SQLITE_LIBS)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/testutils/libtestutils.la
...
...
src/lib/asiodns/tests/Makefile.am
View file @
862e13c5
...
...
@@ -33,7 +33,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/asiodns/libasiodns.la
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
$(LOG4CPLUS_LDFLAGS)
# Note: the ordering matters: -Wno-... must follow -Wextra (defined in
# B10_CXXFLAGS)
...
...
src/lib/asiolink/tests/Makefile.am
View file @
862e13c5
...
...
@@ -40,7 +40,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/log/liblog.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
$(LOG4CPLUS_LDFLAGS)
# Note: the ordering matters: -Wno-... must follow -Wextra (defined in
# B10_CXXFLAGS)
...
...
src/lib/cache/tests/Makefile.am
View file @
862e13c5
...
...
@@ -44,7 +44,7 @@ run_unittests_SOURCES += cache_test_messagefromfile.h
run_unittests_SOURCES
+=
cache_test_sectioncount.h
run_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
$(LOG4CPLUS_LDFLAGS)
run_unittests_LDADD
=
$(GTEST_LDADD)
# NOTE: we may have to clean up this hack later (see the note in configure.ac)
...
...
src/lib/config/tests/Makefile.am
View file @
862e13c5
...
...
@@ -20,7 +20,7 @@ TESTS += run_unittests
run_unittests_SOURCES
=
ccsession_unittests.cc module_spec_unittests.cc config_data_unittests.cc run_unittests.cc
run_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
$(LOG4CPLUS_LDFLAGS)
run_unittests_LDADD
=
$(GTEST_LDADD)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/cc/libcc.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
...
...
src/lib/datasrc/tests/Makefile.am
View file @
862e13c5
...
...
@@ -29,7 +29,7 @@ run_unittests_SOURCES += zonetable_unittest.cc
run_unittests_SOURCES
+=
memory_datasrc_unittest.cc
run_unittests_SOURCES
+=
logger_unittest.cc
run_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
$(LOG4CPLUS_LDFLAGS)
run_unittests_LDADD
=
$(GTEST_LDADD)
run_unittests_LDADD
+=
$(SQLITE_LIBS)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/datasrc/libdatasrc.la
...
...
src/lib/log/logger_support.cc
View file @
862e13c5
...
...
@@ -149,7 +149,7 @@ void initLogger() {
// B10_LOGGER_SEVERITY, and can be one of "DEBUG", "INFO", "WARN", "ERROR"
// of "FATAL". Note that the string must be in upper case with no leading
// of trailing blanks.
isc
::
log
::
Severity
severity
=
isc
::
log
::
DE
FAULT
;
isc
::
log
::
Severity
severity
=
isc
::
log
::
DE
BUG
;
const
char
*
sev_char
=
getenv
(
"B10_LOGGER_SEVERITY"
);
if
(
sev_char
)
{
string
sev_string
(
sev_char
);
...
...
src/lib/nsas/tests/Makefile.am
View file @
862e13c5
...
...
@@ -43,7 +43,7 @@ run_unittests_SOURCES += zone_entry_unittest.cc
run_unittests_SOURCES
+=
fetchable_unittest.cc
run_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
$(LOG4CPLUS_LDFLAGS)
run_unittests_LDADD
=
$(GTEST_LDADD)
# NOTE: we may have to clean up this hack later (see the note in configure.ac)
...
...
src/lib/resolve/tests/Makefile.am
View file @
862e13c5
...
...
@@ -12,7 +12,7 @@ TESTS =
if
HAVE_GTEST
TESTS
+=
run_unittests
run_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
$(LOG4CPLUS_LDFLAGS)
run_unittests_SOURCES
=
run_unittests.cc
run_unittests_SOURCES
+=
$(top_srcdir)
/src/lib/dns/tests/unittest_util.h
run_unittests_SOURCES
+=
$(top_srcdir)
/src/lib/dns/tests/unittest_util.cc
...
...
src/lib/server_common/tests/Makefile.am
View file @
862e13c5
...
...
@@ -31,7 +31,7 @@ run_unittests_SOURCES += keyring_test.cc
run_unittests_SOURCES
+=
data_path.h
run_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
$(LOG4CPLUS_LDFLAGS)
run_unittests_LDADD
=
$(GTEST_LDADD)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/server_common/libserver_common.la
...
...
tests/tools/badpacket/Makefile.am
View file @
862e13c5
...
...
@@ -31,3 +31,5 @@ badpacket_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
badpacket_LDADD
+=
$(top_builddir)
/src/lib/log/liblog.la
badpacket_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
badpacket_LDFLAGS
=
$(LOG4CPLUS_LDFLAGS)
tests/tools/badpacket/tests/Makefile.am
View file @
862e13c5
...
...
@@ -21,7 +21,7 @@ run_unittests_SOURCES += $(top_builddir)/tests/tools/badpacket/command_options.c
run_unittests_SOURCES
+=
$(top_builddir)
/tests/tools/badpacket/option_info.cc
run_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
run_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
$(LOG4CPLUS_LDFLAGS)
run_unittests_LDFLAGS
+=
$(top_builddir)
/src/lib/log/liblog.la
run_unittests_LDFLAGS
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
run_unittests_LDFLAGS
+=
$(top_builddir)
/src/lib/util/libutil.la
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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