Merge pull request #7871 from omoerbeek/calidns-openbsd

[thirdparty/pdns.git] / pdns / Makefile.am

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 40030a515e85c4296c0dc84e69c388932b14c848..b29a58686c839ad1cb2612c118c713253933cb83 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -99,9 +99,7 @@ bin_PROGRAMS += \
        ixplore \
        sdig
 
-if HAVE_RECVMMSG
 bin_PROGRAMS += calidns
-endif
 
 if HAVE_BOOST_GE_148
 bin_PROGRAMS += \
@@ -223,6 +221,7 @@ pdns_server_SOURCES = \
        tsigutils.hh tsigutils.cc \
        tkey.cc \
        ueberbackend.cc ueberbackend.hh \
+       uuid-utils.hh uuid-utils.cc \
        unix_semaphore.cc \
        unix_utility.cc \
        utility.hh \
@@ -312,6 +311,7 @@ pdnsutil_SOURCES = \
        ednsoptions.cc ednsoptions.hh \
        ednssubnet.cc \
        gss_context.cc gss_context.hh \
+       ipcipher.cc ipcipher.hh \
        iputils.cc iputils.hh \
        json.cc \
        logger.cc \
@@ -349,7 +349,8 @@ pdnsutil_LDADD = \
        $(JSON11_LIBS) \
        $(LIBDL) \
        $(BOOST_PROGRAM_OPTIONS_LIBS) \
-       $(LIBCRYPTO_LIBS)
+       $(LIBCRYPTO_LIBS) \
+       $(IPCRYPT_LIBS)
 
 if LIBSODIUM
 pdnsutil_SOURCES += sodiumsigners.cc
@@ -500,6 +501,11 @@ sdig_SOURCES = \
 sdig_LDADD = $(LIBCRYPTO_LIBS)
 sdig_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
 
+if HAVE_LIBCURL
+sdig_SOURCES += minicurl.cc minicurl.hh
+sdig_LDADD += $(LIBCURL)
+endif
+
 calidns_SOURCES = \
        base32.cc \
        base64.cc base64.hh \
@@ -640,6 +646,7 @@ ixfrdist_SOURCES = \
        threadname.hh threadname.cc \
        tsigverifier.cc tsigverifier.hh \
        unix_utility.cc \
+       uuid-utils.hh uuid-utils.cc \
        webserver.hh webserver.cc \
        zoneparser-tng.cc
 
@@ -873,25 +880,30 @@ speedtest_SOURCES = \
        sillyrecords.cc \
        speedtest.cc \
        statbag.cc \
-       unix_utility.cc
+       unix_utility.cc \
+       iputils.cc
 
 speedtest_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
 speedtest_LDADD = $(LIBCRYPTO_LIBS) \
        $(RT_LIBS)
 
 dnswasher_SOURCES = \
+       base64.cc \
        dnslabeltext.cc \
        dnsname.hh dnsname.cc \
        dnsparser.hh \
        dnspcap.cc dnspcap.hh \
        dnswasher.cc \
        dnswriter.hh \
+       ipcipher.cc ipcipher.hh \
        logger.cc \
        misc.cc \
        qtype.cc \
        statbag.cc \
        unix_utility.cc
 
+dnswasher_LDFLAGS =    $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
+dnswasher_LDADD =      $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBCRYPTO_LIBS) $(IPCRYPT_LIBS)
 
 dnsbulktest_SOURCES = \
        base32.cc \
@@ -1058,7 +1070,8 @@ pdns_notify_SOURCES = \
        rcpgenerator.cc rcpgenerator.hh \
        sillyrecords.cc \
        statbag.cc \
-       unix_utility.cc
+       unix_utility.cc \
+       dns_random.cc
 
 pdns_notify_LDFLAGS = \
        $(AM_LDFLAGS) \
@@ -1069,6 +1082,10 @@ pdns_notify_LDADD = \
        $(LIBCRYPTO_LIBS) \
        $(BOOST_PROGRAM_OPTIONS_LIBS)
 
+if LIBSODIUM
+pdns_notify_LDADD += $(LIBSODIUM_LIBS)
+endif
+
 dnsscope_SOURCES = \
        arguments.cc \
        base32.cc \
@@ -1267,6 +1284,7 @@ testrunner_SOURCES = \
        ednssubnet.cc \
        gettime.cc gettime.hh \
        gss_context.cc gss_context.hh \
+       ipcipher.cc ipcipher.hh \
        iputils.cc \
        ixfr.cc ixfr.hh \
        logger.cc \
@@ -1277,6 +1295,7 @@ testrunner_SOURCES = \
        nameserver.cc \
        nsecrecords.cc \
        opensslsigners.cc opensslsigners.hh \
+       pollmplexer.cc \
        qtype.cc \
        rcpgenerator.cc \
        responsestats.cc \
@@ -1296,11 +1315,13 @@ testrunner_SOURCES = \
        test-dnsparser_cc.cc \
        test-dnsparser_hh.cc \
        test-dnsrecords_cc.cc \
+       test-ipcrypt_cc.cc \
        test-iputils_hh.cc \
        test-ixfr_cc.cc \
        test-lock_hh.cc \
        test-lua_auth4_cc.cc \
        test-misc_hh.cc \
+       test-mplexer.cc \
        test-nameserver_cc.cc \
        test-packetcache_cc.cc \
        test-packetcache_hh.cc \
@@ -1327,7 +1348,8 @@ testrunner_LDADD = \
        $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) \
        $(RT_LIBS) \
        $(LUA_LIBS) \
-       $(LIBDL)
+       $(LIBDL) \
+       $(IPCRYPT_LIBS)
 
 if PKCS11
 testrunner_SOURCES += pkcs11signers.cc pkcs11signers.hh
@@ -1344,6 +1366,25 @@ testrunner_SOURCES += decafsigners.cc
 testrunner_LDADD += $(LIBDECAF_LIBS)
 endif
 
+if HAVE_FREEBSD
+ixfrdist_SOURCES += kqueuemplexer.cc
+testrunner_SOURCES += kqueuemplexer.cc
+endif
+
+if HAVE_LINUX
+ixfrdist_SOURCES += epollmplexer.cc
+testrunner_SOURCES += epollmplexer.cc
+endif
+
+if HAVE_SOLARIS
+ixfrdist_SOURCES += \
+       devpollmplexer.cc \
+       portsmplexer.cc
+testrunner_SOURCES += \
+       devpollmplexer.cc \
+       portsmplexer.cc
+endif
+
 pdns_control_SOURCES = \
        arguments.cc \
        dynloader.cc \
@@ -1431,6 +1472,7 @@ fuzz_target_packetcache_SOURCES = \
        ednsoptions.cc ednsoptions.hh \
        misc.cc misc.hh \
        packetcache.hh \
+       qtype.cc qtype.hh \
        statbag.cc statbag.hh
 
 fuzz_target_packetcache_DEPENDENCIES = $(fuzz_targets_deps)
@@ -1445,6 +1487,7 @@ fuzz_target_dnsdistcache_SOURCES = \
        dnsname.cc dnsname.hh \
        dnsparser.cc dnsparser.hh \
        dnswriter.cc dnswriter.hh \
+       doh.hh \
        ednsoptions.cc ednsoptions.hh \
        ednssubnet.cc ednssubnet.hh \
        iputils.cc iputils.hh \