From dbe0af4a30b1078b74ff0b3327921aa1b3d8626e Mon Sep 17 00:00:00 2001
From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Wed, 22 Nov 2023 14:26:36 +0100
Subject: [PATCH] Meson: Cleanup some of the tool listings

---
 meson.build      |  30 +++++++++++---
 pdns/meson.build | 106 +++++++++++++++++++++++------------------------
 2 files changed, 77 insertions(+), 59 deletions(-)

diff --git a/meson.build b/meson.build
index 9585f7494b..9f71f45c97 100644
--- a/meson.build
+++ b/meson.build
@@ -226,20 +226,38 @@ if get_option('module-ldap') != 'disabled'
 endif
 
 if get_option('tools')
-  # TODO Broken: comfun
   tools += [
-    'sdig', 'calidns', 'dumresp', 'kvresp', 'stubquery', 'saxfr', 'nsec3dig',
-    'dnswasher', 'dnsreplay', 'dnsscan', 'nproxy', 'pdns-auth-notify', 'dnsscope',
-    'dnsgram', 'dnsdemog', 'dnspcap2calidns', 'dnspcap2protobuf'
+    'calidns',
+    # 'comfun',                   # TODO: Broken
+    'dnsdemog',
+    'dnsgram',
+    'dnspcap2calidns',
+    'dnspcap2protobuf',
+    'dnsreplay',
+    'dnsscan',
+    'dnsscope',
+    'dnswasher',
+    'dumresp',
+    'ixplore',
+    'kvresp',
+    'nproxy',
+    'nsec3dig',
+    'pdns-auth-notify',
+    'saxfr',
+    'sdig',
+    'stubquery',
   ]
 
   if have_boost_1_48_0
-    tools += ['dnstcpbench', 'dnsbulktest']
+    tools += [
+      'dnsbulktest',
+      'dnstcpbench',
+    ]
   endif
 endif
 
 if get_option('tools-ixfrdist')
-  tools += ['ixfrdist', 'ixplore']
+  tools += ['ixfrdist']
 endif
 
 if get_option('unit-tests')
diff --git a/pdns/meson.build b/pdns/meson.build
index 18ce6695cc..72f58e59a3 100644
--- a/pdns/meson.build
+++ b/pdns/meson.build
@@ -1148,6 +1148,59 @@ if get_option('tools')
         libpdns_dnslabeltext,
       ],
     },
+    'ixplore': {
+      'main': 'ixplore.cc',
+      'sources': [
+        'arguments.cc',
+        'axfr-retriever.cc',
+        'base32.cc',
+        'base64.cc',
+        'base64.hh',
+        'dns.cc',
+        'dns_random.hh',
+        'dnsname.cc',
+        'dnsname.hh',
+        'dnsparser.cc',
+        'dnsparser.hh',
+        'dnsrecords.cc',
+        'dnssecinfra.cc',
+        'dnswriter.cc',
+        'dnswriter.hh',
+        'gss_context.cc',
+        'gss_context.hh',
+        'iputils.cc',
+        'ixfr.cc',
+        'ixfr.hh',
+        'ixfrutils.cc',
+        'ixfrutils.hh',
+        'logger.cc',
+        'misc.cc',
+        'misc.hh',
+        'nsecrecords.cc',
+        'qtype.cc',
+        'query-local-address.hh',
+        'query-local-address.cc',
+        'rcpgenerator.cc',
+        'rcpgenerator.hh',
+        'resolver.cc',
+        'sillyrecords.cc',
+        'sstuff.hh',
+        'statbag.cc',
+        'svc-records.cc',
+        'svc-records.hh',
+        'tsigverifier.cc',
+        'tsigverifier.hh',
+        'unix_utility.cc',
+        'zoneparser-tng.cc',
+
+        'pkcs11signers.cc',
+        'pkcs11signers.hh',
+      ],
+      'deps': [
+        deps,
+        libpdns_dnslabeltext,
+      ],
+    },
   }
 
   if have_boost_1_48_0
@@ -1297,59 +1350,6 @@ if get_option('tools-ixfrdist')
         libpdns_dnslabeltext,
       ],
     },
-    'ixplore': {
-      'main': 'ixplore.cc',
-      'sources': [
-        'arguments.cc',
-        'axfr-retriever.cc',
-        'base32.cc',
-        'base64.cc',
-        'base64.hh',
-        'dns.cc',
-        'dns_random.hh',
-        'dnsname.cc',
-        'dnsname.hh',
-        'dnsparser.cc',
-        'dnsparser.hh',
-        'dnsrecords.cc',
-        'dnssecinfra.cc',
-        'dnswriter.cc',
-        'dnswriter.hh',
-        'gss_context.cc',
-        'gss_context.hh',
-        'iputils.cc',
-        'ixfr.cc',
-        'ixfr.hh',
-        'ixfrutils.cc',
-        'ixfrutils.hh',
-        'logger.cc',
-        'misc.cc',
-        'misc.hh',
-        'nsecrecords.cc',
-        'qtype.cc',
-        'query-local-address.hh',
-        'query-local-address.cc',
-        'rcpgenerator.cc',
-        'rcpgenerator.hh',
-        'resolver.cc',
-        'sillyrecords.cc',
-        'sstuff.hh',
-        'statbag.cc',
-        'svc-records.cc',
-        'svc-records.hh',
-        'tsigverifier.cc',
-        'tsigverifier.hh',
-        'unix_utility.cc',
-        'zoneparser-tng.cc',
-
-        'pkcs11signers.cc',
-        'pkcs11signers.hh',
-      ],
-      'deps': [
-        deps,
-        libpdns_dnslabeltext,
-      ],
-    },
   }
 endif
 
-- 
2.47.2