Meson: Move more stuff to libpdns_common

diff --git a/pdns/meson.build b/pdns/meson.build
index 8ecd172077dac0288f143b8108420e8c895d3afb..a56798af5745171ac33ed2d8023b23b9417933c3 100644 (file)
--- a/pdns/meson.build
+++ b/pdns/meson.build
@@ -203,13 +203,41 @@ libpdns_common = declare_dependency(
   link_whole: static_library(
     'pdns-common',
     'arguments.cc',
+    'base32.cc',
+    'base64.cc',
+    'dns.cc',
     'dnsname.cc',
+    'dnsparser.cc',
+    'dnsrecords.cc',
+    'dnswriter.cc',
+    'json.cc',
     'logger.cc',
     'misc.cc',
+    'nsecrecords.cc',
     'qtype.cc',
+    'rcpgenerator.cc',
+    'sillyrecords.cc',
     'statbag.cc',
+    'svc-records.cc',
     'unix_utility.cc',
-    extra_files: [],
+    extra_files: [
+      'arguments.hh',
+      'base32.hh',
+      'base64.hh',
+      'dns.hh',
+      'dnsname.hh',
+      'dnsparser.hh',
+      'dnsrecords.hh',
+      'dnswriter.hh',
+      'json.hh',
+      'misc.hh',
+      'logger.hh',
+      'qtype.hh',
+      'rcpgenerator.hh',
+      'statbag.hh',
+      'svc-records.hh',
+      'utility.hh',
+    ],
     dependencies: [
       deps,
       libpdns_dnslabeltext,
@@ -223,19 +251,13 @@ libpdns_base = declare_dependency(
     'axfr-retriever.cc',
     # TODO Move to a separate module
     'backends' / 'gsql' / 'gsqlbackend.cc',
-    'base32.cc',
-    'base64.cc',
     'credentials.cc',
     'dbdnsseckeeper.cc',
-    'dns.cc',
     'dnsbackend.cc',
     'dnspacket.cc',
-    'dnsparser.cc',
     'dnsproxy.cc',
-    'dnsrecords.cc',
     'dnssecinfra.cc',
     'dnssecsigner.cc',
-    'dnswriter.cc',
     'dynlistener.cc',
     'ednscookies.cc',
     'ednsoptions.cc',
@@ -243,21 +265,16 @@ libpdns_base = declare_dependency(
     'gettime.cc',
     'iputils.cc',
     'ixfr.cc',
-    'json.cc',
-    'nsecrecords.cc',
     'opensslsigners.cc',
     'proxy-protocol.cc',
     'query-local-address.cc',
-    'rcpgenerator.cc',
     'resolver.cc',
     'responsestats.cc',
     'secpoll.cc',
     'serialtweaker.cc',
     'shuffle.cc',
     'signingpipe.cc',
-    'sillyrecords.cc',
     'stubresolver.cc',
-    'svc-records.cc',
     'threadname.cc',
     'trusted-notification-proxy.cc',
     'ueberbackend.cc',
@@ -265,12 +282,9 @@ libpdns_base = declare_dependency(
     'uuid-utils.cc',
     'version.cc',
     extra_files: [
-      'arguments.hh',
       'axfr-retriever.hh',
       'backends/gsql/gsqlbackend.hh',
       'backends/gsql/ssql.hh',
-      'base32.hh',
-      'base64.hh',
       'burtle.hh',
       'cachecleaner.hh',
       'circular_buffer.hh',
@@ -278,17 +292,12 @@ libpdns_base = declare_dependency(
       'credentials.hh',
       'digests.hh',
       'distributor.hh',
-      'dns.hh',
       'dns_random.hh',
       'dnsbackend.hh',
-      'dnsname.hh',
       'dnspacket.hh',
-      'dnsparser.hh',
       'dnsproxy.hh',
-      'dnsrecords.hh',
       'dnssecinfra.hh',
       'dnsseckeeper.hh',
-      'dnswriter.hh',
       'dynhandler.hh',
       'dynlistener.hh',
       'dynmessenger.hh',
@@ -299,20 +308,15 @@ libpdns_base = declare_dependency(
       'histogram.hh',
       'iputils.hh',
       'ixfr.hh',
-      'json.hh',
       'lock.hh',
-      'logger.hh',
       'logging.hh',
-      'misc.hh',
       'namespaces.hh',
       'noinitvector.hh',
       'opensslsigners.hh',
       'packetcache.hh',
       'pdnsexception.hh',
       'proxy-protocol.hh',
-      'qtype.hh',
       'query-local-address.hh',
-      'rcpgenerator.hh',
       'resolver.hh',
       'responsestats.hh',
       'secpoll.hh',
@@ -320,13 +324,10 @@ libpdns_base = declare_dependency(
       'shuffle.hh',
       'signingpipe.hh',
       'stat_t.hh',
-      'statbag.hh',
       'stubresolver.hh',
-      'svc-records.hh',
       'threadname.hh',
       'trusted-notification-proxy.hh',
       'ueberbackend.hh',
-      'utility.hh',
       'uuid-utils.hh',
       'version.hh',
     ],