]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] more ldadd order fixes
authorJelte Jansen <jelte@isc.org>
Fri, 4 May 2012 07:53:49 +0000 (07:53 +0000)
committerJelte Jansen <jelte@isc.org>
Fri, 4 May 2012 07:53:49 +0000 (07:53 +0000)
other binaries in log/unittests also need to link to our local libs first

src/lib/log/tests/Makefile.am

index cc4d2e94611909e86b8a8832b108df03cf6cf9a1..6f3d7686dd8a7686a53fa61f94d9d6b2b23f052d 100644 (file)
@@ -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 =