From cc0b929d0d82eab6df92a23a0a09d330938d79eb Mon Sep 17 00:00:00 2001 From: Jelte Jansen Date: Fri, 4 May 2012 07:53:49 +0000 Subject: [PATCH] [master] more ldadd order fixes other binaries in log/unittests also need to link to our local libs first --- src/lib/log/tests/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am index cc4d2e9461..6f3d7686dd 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 =