Meson: Build pdnsutil

diff --git a/meson.build b/meson.build
index 26e7707d7c0b5fa64baf9c8bf5b1a306f535e425..b6a5807653c4f9ea975593c045b0700aeff72baf 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -210,13 +210,26 @@ deps = [
 ]
 subdir('pdns')
 
-pdns_server = executable(
-  'pdns_server',
+pdns_auth = executable(
+  'pdns-auth',
   config_h,
   export_dynamic: true,
   dependencies: [
     libpdns,
     libpdns_auth,
+    libpdns_auth_main,
+    libpdns_auth_ws,
     dep_modules,
   ],
 )
+
+pdns_util = executable(
+  'pdns-util',
+  config_h,
+  dependencies: [
+    libpdns,
+    libpdns_auth,
+    libpdns_util,
+    libpdns_util_main,
+  ],
+)

diff --git a/pdns/meson.build b/pdns/meson.build
index bd7e2bd90d2b337facb561f5355fca662acd1c14..0c3c62dc3571480f68f3f4f6cf7bceb010694339 100644 (file)
--- a/pdns/meson.build
+++ b/pdns/meson.build
@@ -1,21 +1,3 @@
-libpdns_bind_dnssec_schema = custom_target(
-  'libpdns-bind-dnssec-schema',
-  command: [
-    python_prog,
-    '@INPUT0@',
-    '@INPUT1@',
-  ],
-  input: [
-    'generate-bind-dnssec-schema.py',
-    'bind-dnssec.schema.sqlite3.sql',
-  ],
-  output: 'bind-dnssec.schema.sqlite3.sql.h',
-  capture: true,
-)
-libpdns_bind_dnssec_schema = declare_dependency(
-  sources: [libpdns_bind_dnssec_schema],
-)
-
 libpdns_bind_parser = declare_dependency(
   link_with: static_library(
     'pdns-bind-parser',
@@ -249,7 +231,6 @@ libpdns = declare_dependency(
     ],
     dependencies: [
       deps,
-      libpdns_bind_dnssec_schema,
       libpdns_bind_parser,
       libpdns_lua,
       libpdns_lua_records,
@@ -319,7 +300,7 @@ endif
 
 libpdns_auth = declare_dependency(
   link_with: static_library(
-    'pdns-auth',
+    'libpdns-auth',
     'auth-caches.cc',
     'auth-carbon.cc',
     'auth-catalogzone.cc',
@@ -342,8 +323,59 @@ libpdns_auth = declare_dependency(
       deps,
       libpdns_auth_api_swagger,
       libpdns_auth_lua,
-      libpdns_auth_main,
-      libpdns_auth_ws,
+    ],
+  )
+)
+
+libpdns_bind_dnssec_schema = custom_target(
+  'libpdns-bind-dnssec-schema',
+  command: [
+    python_prog,
+    '@INPUT0@',
+    '@INPUT1@',
+  ],
+  input: [
+    'generate-bind-dnssec-schema.py',
+    'bind-dnssec.schema.sqlite3.sql',
+  ],
+  output: 'bind-dnssec.schema.sqlite3.sql.h',
+  capture: true,
+)
+libpdns_bind_dnssec_schema = declare_dependency(
+  sources: [libpdns_bind_dnssec_schema],
+)
+
+libpdns_ipcipher = dependency('', required: false)
+if enable_ipcipher
+  libpdns_ipcipher = declare_dependency(
+    link_with: static_library(
+      'libpdns-ipcipher',
+      'ipcipher.cc',
+      dependencies: deps,
+    )
+  )
+endif
+
+libpdns_util_main = declare_dependency(
+  link_with: static_library(
+    'libpdns-util-main',
+    'pdnsutil.cc',
+    dependencies: deps,
+  )
+)
+
+libpdns_util = declare_dependency(
+  link_with: static_library(
+    'libpdns-util',
+    'zonemd.cc',
+    extra_files: [
+      'zonemd.hh',
+    ],
+    dependencies: [
+      deps,
+      libpdns_util_main,
+      libpdns_bind_dnssec_schema,
+      libpdns_ipcipher,
     ],
   )
 )