From 614ad2867d379449b0d380d48d5be2f9ebf3e315 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Mon, 15 Feb 2016 14:48:47 +0100 Subject: [PATCH] rip out the most obvious supporting pieces for building ddnsdist and pdns_recursor in the auth tree --- configure.ac | 4 -- pdns/Makefile.am | 170 ----------------------------------------------- 2 files changed, 174 deletions(-) diff --git a/configure.ac b/configure.ac index 5a2a1f32d..b29b3ec56 100644 --- a/configure.ac +++ b/configure.ac @@ -296,10 +296,6 @@ PDNS_ENABLE_COVERAGE PDNS_ENABLE_SANITIZERS PDNS_ENABLE_MALLOC_TRACE -# Test if the pdns/dnsdistdist/html directory exists, so `make dnsdist` from the -# repo root can still work. -AM_CONDITIONAL([HAVE_DNSDISTDISTHTML], [test -d $srcdir/pdns/dnsdistdist/html]) - AC_SUBST(LIBS) AC_SUBST([AM_CPPFLAGS], diff --git a/pdns/Makefile.am b/pdns/Makefile.am index e43ea2074..2124caaf3 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -114,8 +114,6 @@ EXTRA_PROGRAMS = \ notify \ nproxy \ nsec3dig \ - pdns_recursor \ - rec_control \ saxfr \ sdig \ speedtest \ @@ -973,19 +971,6 @@ dnsdemog_LDFLAGS = \ dnsdemog_LDADD = \ $(OPENSSL_LIBS) -rec_control_SOURCES = \ - arguments.cc arguments.hh \ - dnsname.hh dnsname.cc \ - dnslabeltext.cc \ - logger.cc \ - misc.cc \ - qtype.cc \ - rec_channel.cc rec_channel.hh \ - rec_control.cc \ - statbag.cc \ - unix_utility.cc - - testrunner_SOURCES = \ arguments.cc \ base32.cc \ @@ -1060,104 +1045,6 @@ testrunner_SOURCES += pkcs11signers.cc pkcs11signers.hh testrunner_LDADD += $(P11KIT1_LIBS) endif -pdns_recursor_SOURCES = \ - arguments.cc \ - base32.cc \ - base64.cc base64.hh \ - cachecleaner.hh \ - dns.cc \ - dns_random.cc \ - dnslabeltext.cc \ - dnsname.cc dnsname.hh \ - dnsparser.cc \ - dnsrecords.cc dnsrecords.hh \ - dnssecinfra.cc \ - dnswriter.cc dnswriter.hh \ - ednssubnet.cc ednssubnet.hh \ - filterpo.cc filterpo.hh \ - gss_context.cc gss_context.hh \ - iputils.cc \ - ixfr.cc ixfr.hh \ - json.cc json.hh \ - logger.cc \ - lua-recursor4.cc lua-recursor4.hh \ - lwres.cc lwres.hh \ - misc.cc \ - mtasker.hh \ - nsecrecords.cc \ - pdns_recursor.cc \ - pubsuffix.cc \ - qtype.cc \ - opensslsigners.cc opensslsigners.hh \ - randomhelper.cc \ - rcpgenerator.cc rcpgenerator.hh \ - rec-carbon.cc \ - rec_channel.cc rec_channel.hh \ - rec_channel_rec.cc \ - rec-lua-conf.cc \ - recpacketcache.cc recpacketcache.hh \ - recursor_cache.cc recursor_cache.hh \ - reczones.cc \ - resolver.cc \ - resolver.hh \ - responsestats.cc \ - rpzloader.cc rpzloader.hh \ - secpoll-recursor.cc \ - secpoll-recursor.hh \ - selectmplexer.cc \ - sillyrecords.cc \ - sortlist.cc sortlist.hh \ - statbag.cc \ - syncres.cc syncres.hh \ - unix_utility.cc \ - validate.cc validate.hh validate-recursor.cc validate-recursor.hh \ - version.cc version.hh \ - webserver.cc webserver.hh \ - ws-api.cc ws-api.hh \ - ws-recursor.cc ws-recursor.hh \ - zoneparser-tng.cc zoneparser-tng.hh - -pdns_recursor_LDADD = \ - $(YAHTTP_LIBS) \ - $(JSON11_LIBS) \ - $(OPENSSL_LIBS) - -pdns_recursor_LDFLAGS = $(AM_LDFLAGS) \ - $(OPENSSL_LDFLAGS) - -if PKCS11 -pdns_recursor_SOURCES += pkcs11signers.cc pkcs11signers.hh -pdns_recursor_LDADD += $(P11KIT1_LIBS) -endif - -if BOTAN110 -pdns_recursor_SOURCES += botan110signers.cc botansigners.cc -pdns_recursor_LDADD += $(BOTAN110_LIBS) -endif - -if MALLOC_TRACE -pdns_recursor_SOURCES += malloctrace.cc malloctrace.hh -pdns_recursor_LDFLAGS += -rdynamic -endif - -if LUA -pdns_recursor_LDADD += $(LUA_LIBS) -endif - -if HAVE_FREEBSD -pdns_recursor_SOURCES += kqueuemplexer.cc -endif - -if HAVE_LINUX -pdns_recursor_SOURCES += epollmplexer.cc -endif - -if HAVE_SOLARIS -pdns_recursor_SOURCES += \ - devpollmplexer.cc \ - portsmplexer.cc -endif - pdns_control_SOURCES = \ arguments.cc \ dynloader.cc \ @@ -1170,63 +1057,6 @@ pdns_control_SOURCES = \ dnsname.cc \ dnslabeltext.cc -if HAVE_DNSDISTDISTHTML -BUILT_SOURCES += htmlfiles.h -EXTRA_PROGRAMS += dnsdist - -testrunner_SOURCES += \ - test-sholder_hh.cc - -nodist_dnsdist_SOURCES = \ - base32.cc \ - base64.hh \ - dns.cc \ - dnscrypt.cc dnscrypt.hh \ - dnsparser.hh dnsparser.cc \ - ednssubnet.cc ednssubnet.hh \ - dnsdist.cc \ - dnsdist-carbon.cc \ - dnsdist-console.cc \ - dnsdist-dnscrypt.cc \ - dnsdist-ecs.cc dnsdist-ecs.hh \ - dnsdist-lua.cc \ - dnsdist-lua2.cc \ - dnsdist-rings.cc \ - dnsdist-tcp.cc \ - dnsdist-web.cc \ - dnslabeltext.cc \ - dnsname.cc dnsname.hh \ - dnswriter.cc \ - dolog.hh \ - iputils.cc \ - htmlfiles.h \ - misc.cc misc.hh \ - qtype.cc \ - sholder.hh \ - sodcrypto.cc sodcrypto.hh \ - sstuff.hh \ - ../ext/json11/json11.cpp - -dnsdist_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(OPENSSL_LDFLAGS) - -dnsdist_LDADD = \ - $(LUA_LIBS) \ - $(LIBEDIT_LIBS) \ - $(RT_LIBS) \ - $(YAHTTP_LIBS) \ - $(LIBSODIUM_LIBS) \ - $(OPENSSL_LIBS) - -if HAVE_RE2 -dnsdist_LDADD += $(RE2_LIBS) -endif - -htmlfiles.h: $(srcdir)/dnsdistdist/html/* - $(srcdir)/dnsdistdist/incfiles $(srcdir)/dnsdistdist > $@ -endif - if UNIT_TESTS TESTS_ENVIRONMENT = env BOOST_TEST_LOG_LEVEL=message SRCDIR='$(srcdir)' TESTS=testrunner -- 2.40.0