From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 5 Oct 2014 11:37:41 +0000 (+0200)
Subject: Move BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS to library
X-Git-Tag: rec-3.7.0-rc1~221^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ccbcee6fd1bdd275a3c7e150eecba3da2ecb4b3;p=pdns

Move BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS to library
---

diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am
index 1d2858ea6..1af428dd5 100644
--- a/modules/remotebackend/Makefile.am
+++ b/modules/remotebackend/Makefile.am
@@ -43,6 +43,7 @@ libtestremotebackend_la_SOURCES=../../pdns/dnsbackend.hh ../../pdns/dnsbackend.c
         remotebackend.hh remotebackend.cc unixconnector.cc httpconnector.cc pipeconnector.cc zmqconnector.cc
 
 libtestremotebackend_la_LIBADD = -L../../pdns/ext/yahttp/yahttp -lyahttp $(POLARSSL_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS)
+libtestremotebackend_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS)
 
 if REMOTEBACKEND_ZEROMQ
 libtestremotebackend_la_LIBADD += $(LIBZMQ_LIBS)
@@ -56,25 +57,25 @@ endif
 
 test_remotebackend_http_SOURCES = test-remotebackend.cc test-remotebackend-http.cc test-remotebackend-keys.hh
 test_remotebackend_http_LDADD = libtestremotebackend.la $(LIBDL)
-test_remotebackend_http_LDFLAGS = $(AM_LDFLAGS) $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS)
+test_remotebackend_http_LDFLAGS = $(AM_LDFLAGS) $(DYNLINKFLAGS) $(THREADFLAGS)
 
 test_remotebackend_json_SOURCES = test-remotebackend.cc test-remotebackend-json.cc test-remotebackend-keys.hh
 test_remotebackend_json_LDADD = libtestremotebackend.la $(LIBDL)
-test_remotebackend_json_LDFLAGS = $(AM_LDFLAGS) $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS)
+test_remotebackend_json_LDFLAGS = $(AM_LDFLAGS) $(DYNLINKFLAGS) $(THREADFLAGS)
 
 test_remotebackend_pipe_SOURCES = test-remotebackend.cc test-remotebackend-pipe.cc test-remotebackend-keys.hh 
 test_remotebackend_pipe_LDADD = libtestremotebackend.la $(LIBDL)
-test_remotebackend_pipe_LDFLAGS = $(AM_LDFLAGS) $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS)
+test_remotebackend_pipe_LDFLAGS = $(AM_LDFLAGS) $(DYNLINKFLAGS) $(THREADFLAGS)
 
 test_remotebackend_post_SOURCES = test-remotebackend.cc test-remotebackend-post.cc test-remotebackend-keys.hh
 test_remotebackend_post_LDADD = libtestremotebackend.la $(LIBDL)
-test_remotebackend_post_LDFLAGS = $(AM_LDFLAGS) $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS)
+test_remotebackend_post_LDFLAGS = $(AM_LDFLAGS) $(DYNLINKFLAGS) $(THREADFLAGS)
 
 test_remotebackend_unix_SOURCES = test-remotebackend.cc test-remotebackend-unix.cc test-remotebackend-keys.hh
 test_remotebackend_unix_LDADD = libtestremotebackend.la $(LIBDL)
-test_remotebackend_unix_LDFLAGS = $(AM_LDFLAGS) $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS)
+test_remotebackend_unix_LDFLAGS = $(AM_LDFLAGS) $(DYNLINKFLAGS) $(THREADFLAGS)
 
 test_remotebackend_zeromq_SOURCES = test-remotebackend.cc test-remotebackend-zeromq.cc test-remotebackend-keys.hh
 test_remotebackend_zeromq_LDADD = libtestremotebackend.la $(LIBDL)
-test_remotebackend_zeromq_LDFLAGS = $(AM_LDFLAGS) $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS)
+test_remotebackend_zeromq_LDFLAGS = $(AM_LDFLAGS) $(DYNLINKFLAGS) $(THREADFLAGS)