BIND 10 master, updated. 3d876bb262c8eea4b3cdc60f293249068adde2c2 [master] link gtest libs after local libs

BIND 10 source code commits bind10-changes at lists.isc.org
Thu May 3 22:15:38 UTC 2012


The branch, master has been updated
       via  3d876bb262c8eea4b3cdc60f293249068adde2c2 (commit)
      from  3a9c1b6387eb19a1749e7e9a4dec753b33da5766 (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 3d876bb262c8eea4b3cdc60f293249068adde2c2
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu May 3 22:14:29 2012 +0000

    [master] link gtest libs after local libs
    
    so that sys-installed bind10 libraries do not interfere with those in the build tree

-----------------------------------------------------------------------

Summary of changes:
 src/lib/log/tests/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am
index c07eb4a..cc4d2e9 100644
--- a/src/lib/log/tests/Makefile.am
+++ b/src/lib/log/tests/Makefile.am
@@ -41,12 +41,12 @@ endif
 AM_CPPFLAGS += $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES)
 AM_LDFLAGS  += $(GTEST_LDFLAGS)
 
-AM_LDADD += $(GTEST_LDADD)
 AM_LDADD += $(top_builddir)/src/lib/log/liblog.la
 AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 AM_LDADD += $(top_builddir)/src/lib/util/libutil.la
 AM_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
 AM_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
+AM_LDADD += $(GTEST_LDADD)
 
 # Set of unit tests for the general logging classes
 TESTS += run_unittests



More information about the bind10-changes mailing list