BIND 10 master, updated. 56083b82568a61b2fc48afd95b7e998568216894 Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri May 4 07:56:09 UTC 2012
The branch, master has been updated
via 56083b82568a61b2fc48afd95b7e998568216894 (commit)
via cc0b929d0d82eab6df92a23a0a09d330938d79eb (commit)
from d6d267370155e3feeaa108af1d05931afac1f787 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 56083b82568a61b2fc48afd95b7e998568216894
Merge: cc0b929d0d82eab6df92a23a0a09d330938d79eb d6d267370155e3feeaa108af1d05931afac1f787
Author: Jelte Jansen <jelte at isc.org>
Date: Fri May 4 07:55:49 2012 +0000
Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10
commit cc0b929d0d82eab6df92a23a0a09d330938d79eb
Author: Jelte Jansen <jelte at isc.org>
Date: Fri May 4 07:53:49 2012 +0000
[master] more ldadd order fixes
other binaries in log/unittests also need to link to our local libs first
-----------------------------------------------------------------------
Summary of changes:
src/lib/log/tests/Makefile.am | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am
index cc4d2e9..6f3d768 100644
--- a/src/lib/log/tests/Makefile.am
+++ b/src/lib/log/tests/Makefile.am
@@ -16,19 +16,19 @@ noinst_PROGRAMS = logger_example
logger_example_SOURCES = logger_example.cc
logger_example_CPPFLAGS = $(AM_CPPFLAGS)
logger_example_LDFLAGS = $(AM_LDFLAGS)
-logger_example_LDADD = $(AM_LDADD) $(LOG4CPLUS_LIBS)
-logger_example_LDADD += $(top_builddir)/src/lib/log/liblog.la
+logger_example_LDADD = $(top_builddir)/src/lib/log/liblog.la
logger_example_LDADD += $(top_builddir)/src/lib/util/libutil.la
logger_example_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+logger_example_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
noinst_PROGRAMS += init_logger_test
init_logger_test_SOURCES = init_logger_test.cc
init_logger_test_CPPFLAGS = $(AM_CPPFLAGS)
init_logger_test_LDFLAGS = $(AM_LDFLAGS)
-init_logger_test_LDADD = $(AM_LDADD) $(LOG4CPLUS_LIBS)
-init_logger_test_LDADD += $(top_builddir)/src/lib/log/liblog.la
+init_logger_test_LDADD = $(top_builddir)/src/lib/log/liblog.la
init_logger_test_LDADD += $(top_builddir)/src/lib/util/libutil.la
init_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+init_logger_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
if HAVE_GTEST
TESTS =
More information about the bind10-changes
mailing list