]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Don't set BOOST_CPPFLAGS and THREADFLAGS twice
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 5 Oct 2014 10:33:09 +0000 (12:33 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 6 Oct 2014 10:07:11 +0000 (12:07 +0200)
They are already set in AM_CPPFLAGS

modules/remotebackend/Makefile.am

index f5c3a0deb789c1588aa1574923a59a4b7f63fac0..7c3ee1e33ed6d79ace30f4a21897f2b6df53727e 100644 (file)
@@ -54,21 +54,21 @@ test_remotebackend_post_SOURCES=test-remotebackend.cc test-remotebackend-post.cc
 test_remotebackend_json_SOURCES=test-remotebackend.cc test-remotebackend-json.cc test-remotebackend-keys.hh
 test_remotebackend_zeromq_SOURCES=test-remotebackend.cc test-remotebackend-zeromq.cc test-remotebackend-keys.hh
 
-test_remotebackend_pipe_CXXFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -I../../pdns
+test_remotebackend_pipe_CXXFLAGS=-I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -I../../pdns
 test_remotebackend_pipe_LDADD=libtestremotebackend.la $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBDL) $(POLARSSL_LIBS) $(LIBZMQ_LIBS) 
 
-test_remotebackend_unix_CXXFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -I../../pdns
+test_remotebackend_unix_CXXFLAGS=-I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -I../../pdns
 test_remotebackend_unix_LDADD=libtestremotebackend.la $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBDL) $(POLARSSL_LIBS) $(LIBZMQ_LIBS) 
 
-test_remotebackend_http_CXXFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -I../../pdns
+test_remotebackend_http_CXXFLAGS=-I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -I../../pdns
 test_remotebackend_http_LDADD=libtestremotebackend.la $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBDL) $(POLARSSL_LIBS) $(LIBZMQ_LIBS) 
 
-test_remotebackend_post_CXXFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -I../../pdns
+test_remotebackend_post_CXXFLAGS=-I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -I../../pdns
 test_remotebackend_post_LDADD=libtestremotebackend.la $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBDL) $(POLARSSL_LIBS) $(LIBZMQ_LIBS) 
 
-test_remotebackend_json_CXXFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -I../../pdns
+test_remotebackend_json_CXXFLAGS=-I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -I../../pdns
 test_remotebackend_json_LDADD=libtestremotebackend.la $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBDL) $(POLARSSL_LIBS) $(LIBZMQ_LIBS) 
 
-test_remotebackend_zeromq_CXXFLAGS=$(BOOST_CPPFLAGS) $(THREADFLAGS) -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -I../../pdns
+test_remotebackend_zeromq_CXXFLAGS=-I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -I../../pdns
 test_remotebackend_zeromq_LDADD=libtestremotebackend.la $(DYNLINKFLAGS) $(THREADFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBDL) $(POLARSSL_LIBS) $(LIBZMQ_LIBS)