From: Jelte Jansen Date: Thu, 3 May 2012 22:14:29 +0000 (+0000) Subject: [master] link gtest libs after local libs X-Git-Tag: trac2351_base~226^2~90^2~40 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d876bb262c8eea4b3cdc60f293249068adde2c2;p=thirdparty%2Fkea.git [master] link gtest libs after local libs so that sys-installed bind10 libraries do not interfere with those in the build tree --- diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am index c07eb4a793..cc4d2e9461 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