From c532b65478e5bcfa7bdb7ec024dfa95b68684910 Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Sun, 5 Oct 2014 15:06:13 +0200 Subject: [PATCH] Break long lines --- modules/remotebackend/Makefile.am | 159 +++++++++++++++++++++++++----- 1 file changed, 133 insertions(+), 26 deletions(-) diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am index b830fc396..bbeafdb05 100644 --- a/modules/remotebackend/Makefile.am +++ b/modules/remotebackend/Makefile.am @@ -1,9 +1,36 @@ -AM_CPPFLAGS += $(THREADFLAGS) -I../../pdns/ext/rapidjson/include -I../../pdns/ext/yahttp $(BOOST_CPPFLAGS) $(POLARSSL_CFLAGS) $(LIBZMQ_CFLAGS) +AM_CPPFLAGS += \ + $(THREADFLAGS) \ + -I../../pdns/ext/rapidjson/include \ + -I../../pdns/ext/yahttp \ + $(BOOST_CPPFLAGS) \ + $(POLARSSL_CFLAGS) \ + $(LIBZMQ_CFLAGS) + AM_LDFLAGS = $(THREADFLAGS) SUBDIRS = ../../pdns/ext/yahttp -EXTRA_DIST = OBJECTFILES OBJECTLIBS testrunner.sh unittest_http.rb unittest_json.rb unittest_pipe.rb unittest_zeromq.rb unittest_post.rb unittest.rb Gemfile Gemfile.lock -EXTRA_PROGRAMS = test_remotebackend_pipe test_remotebackend_unix test_remotebackend_http test_remotebackend_post test_remotebackend_json test_remotebackend_zeromq + +EXTRA_DIST = \ + OBJECTFILES \ + OBJECTLIBS \ + testrunner.sh \ + unittest_http.rb \ + unittest_json.rb \ + unittest_pipe.rb \ + unittest_zeromq.rb \ + unittest_post.rb \ + unittest.rb \ + Gemfile \ + Gemfile.lock + +EXTRA_PROGRAMS = \ + test_remotebackend_pipe \ + test_remotebackend_unix \ + test_remotebackend_http \ + test_remotebackend_post \ + test_remotebackend_json \ + test_remotebackend_zeromq + EXTRA_LTLIBRARIES = libtestremotebackend.la clean-local: @@ -11,9 +38,16 @@ clean-local: pkglib_LTLIBRARIES = libremotebackend.la -libremotebackend_la_SOURCES = remotebackend.hh remotebackend.cc unixconnector.cc httpconnector.cc pipeconnector.cc zmqconnector.cc +libremotebackend_la_SOURCES = \ + remotebackend.hh \ + remotebackend.cc \ + unixconnector.cc \ + httpconnector.cc \ + pipeconnector.cc \ + zmqconnector.cc libremotebackend_la_LDFLAGS = -module -avoid-version + libremotebackend_la_LIBADD = ../../pdns/ext/yahttp/yahttp/libyahttp.la if REMOTEBACKEND_ZEROMQ @@ -21,8 +55,16 @@ libremotebackend_la_LIBADD += $(LIBZMQ_LIBS) endif if UNIT_TESTS -TESTS_ENVIRONMENT = env BOOST_TEST_LOG_LEVEL=message REMOTEBACKEND_ZEROMQ=$(REMOTEBACKEND_ZEROMQ) ./testrunner.sh -TESTS = test_remotebackend_pipe test_remotebackend_unix test_remotebackend_http test_remotebackend_post test_remotebackend_json test_remotebackend_zeromq +TESTS_ENVIRONMENT = \ + env BOOST_TEST_LOG_LEVEL=message REMOTEBACKEND_ZEROMQ=$(REMOTEBACKEND_ZEROMQ) ./testrunner.sh + +TESTS = \ + test_remotebackend_pipe \ + test_remotebackend_unix \ + test_remotebackend_http \ + test_remotebackend_post \ + test_remotebackend_json \ + test_remotebackend_zeromq endif BUILT_SOURCES = ../../pdns/dnslabeltext.cc @@ -30,43 +72,108 @@ BUILT_SOURCES = ../../pdns/dnslabeltext.cc ../../pdns/dnslabeltext.cc: ../../pdns/dnslabeltext.rl $(MAKE) -C ../../pdns dnslabeltext.cc -libtestremotebackend_la_SOURCES = ../../pdns/dnsbackend.hh ../../pdns/dnsbackend.cc ../../pdns/ueberbackend.hh ../../pdns/ueberbackend.cc \ - ../../pdns/nameserver.cc ../../pdns/misc.cc ../../pdns/arguments.hh \ - ../../pdns/unix_utility.cc ../../pdns/logger.cc ../../pdns/statbag.cc ../../pdns/arguments.hh ../../pdns/arguments.cc ../../pdns/qtype.cc ../../pdns/dnspacket.cc \ - ../../pdns/dnswriter.cc ../../pdns/base64.cc ../../pdns/base32.cc ../../pdns/dnsrecords.cc ../../pdns/dnslabeltext.cc ../../pdns/dnsparser.cc \ - ../../pdns/rcpgenerator.cc ../../pdns/ednssubnet.cc ../../pdns/nsecrecords.cc ../../pdns/sillyrecords.cc ../../pdns/dnssecinfra.cc \ - ../../pdns/dns_random.cc ../../pdns/packetcache.hh ../../pdns/packetcache.cc \ - ../../pdns/dns.hh ../../pdns/dns.cc ../../pdns/json.hh ../../pdns/json.cc \ - 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) +libtestremotebackend_la_SOURCES = \ + ../../pdns/dnsbackend.hh ../../pdns/dnsbackend.cc \ + ../../pdns/ueberbackend.hh ../../pdns/ueberbackend.cc \ + ../../pdns/nameserver.cc \ + ../../pdns/misc.cc \ + ../../pdns/arguments.hh \ + ../../pdns/unix_utility.cc \ + ../../pdns/logger.cc \ + ../../pdns/statbag.cc \ + ../../pdns/arguments.hh \ + ../../pdns/arguments.cc \ + ../../pdns/qtype.cc \ + ../../pdns/dnspacket.cc \ + ../../pdns/dnswriter.cc \ + ../../pdns/base64.cc \ + ../../pdns/base32.cc \ + ../../pdns/dnsrecords.cc \ + ../../pdns/dnslabeltext.cc \ + ../../pdns/dnsparser.cc \ + ../../pdns/rcpgenerator.cc \ + ../../pdns/ednssubnet.cc \ + ../../pdns/nsecrecords.cc \ + ../../pdns/sillyrecords.cc \ + ../../pdns/dnssecinfra.cc \ + ../../pdns/dns_random.cc \ + ../../pdns/packetcache.hh ../../pdns/packetcache.cc \ + ../../pdns/dns.hh ../../pdns/dns.cc \ + ../../pdns/json.hh ../../pdns/json.cc \ + 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) endif if PKCS11 -libtestremotebackend_la_SOURCES += ../../pdns/pkcs11signers.hh ../../pdns/pkcs11signers.cc -libtestremotebackend_la_LIBADD += $(P11KIT1_LIBS) $(LIBDL) -libtestremotebackend_la_CPPFLAGS = $(P11KIT1_CFLAGS) $(AM_CPPFLAGS) +libtestremotebackend_la_SOURCES += \ + ../../pdns/pkcs11signers.hh \ + ../../pdns/pkcs11signers.cc + +libtestremotebackend_la_LIBADD += \ + $(P11KIT1_LIBS) \ + $(LIBDL) + +libtestremotebackend_la_CPPFLAGS = \ + $(P11KIT1_CFLAGS) \ + $(AM_CPPFLAGS) endif -test_remotebackend_http_SOURCES = test-remotebackend.cc test-remotebackend-http.cc test-remotebackend-keys.hh +test_remotebackend_http_SOURCES = \ + test-remotebackend.cc \ + test-remotebackend-http.cc \ + test-remotebackend-keys.hh + test_remotebackend_http_LDADD = libtestremotebackend.la -test_remotebackend_json_SOURCES = test-remotebackend.cc test-remotebackend-json.cc test-remotebackend-keys.hh +test_remotebackend_json_SOURCES = \ + test-remotebackend.cc \ + test-remotebackend-json.cc \ + test-remotebackend-keys.hh + test_remotebackend_json_LDADD = libtestremotebackend.la -test_remotebackend_pipe_SOURCES = test-remotebackend.cc test-remotebackend-pipe.cc test-remotebackend-keys.hh +test_remotebackend_pipe_SOURCES = \ + test-remotebackend.cc \ + test-remotebackend-pipe.cc \ + test-remotebackend-keys.hh + test_remotebackend_pipe_LDADD = libtestremotebackend.la -test_remotebackend_post_SOURCES = test-remotebackend.cc test-remotebackend-post.cc test-remotebackend-keys.hh +test_remotebackend_post_SOURCES = \ + test-remotebackend.cc \ + test-remotebackend-post.cc \ + test-remotebackend-keys.hh + test_remotebackend_post_LDADD = libtestremotebackend.la -test_remotebackend_unix_SOURCES = test-remotebackend.cc test-remotebackend-unix.cc test-remotebackend-keys.hh +test_remotebackend_unix_SOURCES = \ + test-remotebackend.cc \ + test-remotebackend-unix.cc \ + test-remotebackend-keys.hh + test_remotebackend_unix_LDADD = libtestremotebackend.la -test_remotebackend_zeromq_SOURCES = test-remotebackend.cc test-remotebackend-zeromq.cc test-remotebackend-keys.hh +test_remotebackend_zeromq_SOURCES = \ + test-remotebackend.cc \ + test-remotebackend-zeromq.cc \ + test-remotebackend-keys.hh + test_remotebackend_zeromq_LDADD = libtestremotebackend.la -- 2.40.0