Meson: Rework dependencies handling

diff --git a/meson.build b/meson.build
index 5e5fe82641cb854c4bb4f94796fec9e87ca6aaee..d0bec45e22ddadd61c9d1ce4800d24176d82dbb3 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -172,8 +172,25 @@ config_h = configure_file(configuration: conf, output: 'config.h')
 ext_modules = ['yahttp', 'ipcrypt', 'json11']
 subdir('ext')
 
-# Pdns
+deps = [
+  dep_pdns,
+  dep_atomic,
+  dep_lua,
+  dep_lua_records,
+  dep_gss_tsig,
+  dep_pkcs11,
+  dep_yahttp,
+  dep_json11,
+  dep_systemd,
+]
 subdir('pdns')
 
-internal_deps = [libpdns, libpdns_auth]
-auth = executable('pdns_server', config_h, dependencies: deps, link_with: internal_deps, export_dynamic: true)
+pdns_server = executable(
+  'pdns_server',
+  config_h,
+  export_dynamic: true,
+  dependencies: [
+    libpdns,
+    libpdns_auth,
+  ]
+)

diff --git a/pdns/meson.build b/pdns/meson.build
index 9d6f403920e021aaeff61d8e4040cbb70b63675e..d6a5391e3b828f810f985d86019a95c45e21ca51 100644 (file)
--- a/pdns/meson.build
+++ b/pdns/meson.build
@@ -8,7 +8,7 @@ libpdns_bindparser = declare_dependency(
       'zoneparser-tng.hh',
     ],
     cpp_args: '-Wno-redundant-decls',
-    dependencies: [dep_pdns],
+    dependencies: deps,
   )
 )
 
@@ -21,13 +21,13 @@ if dep_lua.found()
       extra_files: [
         'lua-base4.hh',
       ],
-      dependencies: [dep_pdns, dep_lua],
+      dependencies: deps,
     )
   )
 endif
 
 libpdns_lua_records = dependency('', required: false)
-if opt_lua_records
+if dep_lua_records.found()
   libpdns_lua_records = declare_dependency(
     link_with: static_library(
       'pdns-lua-records',
@@ -36,7 +36,7 @@ if opt_lua_records
       extra_files: [
         'minicurl.hh',
       ],
-      dependencies: [dep_pdns, dep_lua, dep_libcurl],
+      dependencies: deps,
     )
   )
 endif
@@ -55,7 +55,7 @@ if dep_gss_tsig.found()
         'gss_context.hh',
       ],
       cpp_args: '-Wno-redundant-decls',
-      dependencies: [dep_pdns, dep_gss_tsig],
+      dependencies: deps,
     )
   )
 endif
@@ -69,7 +69,7 @@ if dep_pkcs11.found()
       extra_files: [
         'pkcs11signers.hh',
       ],
-      dependencies: [dep_pdns, dep_pkcs11],
+      dependencies: deps,
     )
   )
 endif
@@ -84,7 +84,7 @@ libpdns_ws = declare_dependency(
       'ws-api.hh',
     ],
     cpp_args: '-Wno-overloaded-virtual',
-    dependencies: [dep_pdns, dep_yahttp, dep_json11],
+    dependencies: deps,
   )
 )
 
@@ -227,9 +227,7 @@ libpdns = declare_dependency(
       'version.hh',
     ],
     dependencies: [
-      dep_pdns,
-      dep_json11,
-      dep_yahttp,
+      deps,
       libpdns_bindparser,
       libpdns_lua,
       libpdns_lua_records,
@@ -248,13 +246,7 @@ libpdns_auth_main = declare_dependency(
       'auth-main.hh',
     ],
     cpp_args: '-Wno-overloaded-virtual',
-    dependencies: [
-      dep_pdns,
-      dep_yahttp,
-      dep_json11,
-      dep_systemd,
-      # libpdns_lua_records,
-    ],
+    dependencies: deps,
   )
 )
 
@@ -266,11 +258,7 @@ libpdns_auth_ws = declare_dependency(
       'ws-auth.hh',
     ],
     cpp_args: '-Wno-overloaded-virtual',
-    dependencies: [
-      dep_pdns,
-      dep_yahttp,
-      dep_json11,
-    ],
+    dependencies: deps,
   )
 )
 
@@ -283,10 +271,7 @@ if dep_lua.found()
       extra_files: [
         'lua-auth4.hh',
       ],
-      dependencies: [
-        dep_pdns,
-        libpdns_lua,
-      ],
+      dependencies: deps,
     )
   )
 endif
@@ -311,7 +296,7 @@ libpdns_auth = declare_dependency(
       'secpoll-auth.hh',
     ],
     dependencies: [
-      dep_pdns,
+      deps,
       libpdns_auth_lua,
       libpdns_auth_main,
       libpdns_auth_ws,