Meson: Build modules with all dependencies

diff --git a/meson.build b/meson.build
index 6f8181793b27ebb7f3e69da6ec92234142516e06..7ba99c220a0f8e44060091d2b8ef0579cadb9319 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -94,6 +94,35 @@ subdir('meson' / 'various-headers')         # Various Headers
 ext_modules = ['arc4random', 'yahttp', 'ipcrypt', 'json11']
 subdir('ext')
 
+deps = [
+  dep_pdns,
+  dep_platform,
+  dep_atomics,
+  dep_threads,
+  dep_lua,
+  dep_lua_records,
+  dep_netlibs,
+  dep_libsodium,
+  dep_libdecaf,
+  dep_libcrypto,
+  dep_libssl,
+  dep_gnutls,
+  dep_rt,
+  dep_boost,
+  dep_boost_program_options,
+  dep_unittests,
+  dep_backend_unittests,
+  dep_dlopen,
+  dep_pkcs11,
+  dep_gss_tsig,
+  dep_ixfrdist,
+  dep_yahttp,
+  dep_ipcrypt,
+  dep_json11,
+  dep_arc4random,
+  dep_systemd,
+]
+
 # Modules
 all_modules = {
   'bind':     {'deps': [],                              'exts': []},
@@ -166,33 +195,6 @@ conf.set_quoted(
 # Generate config.h
 config_h = configure_file(configuration: conf, output: 'config.h')
 
-deps = [
-  dep_pdns,
-  dep_platform,
-  dep_atomics,
-  dep_threads,
-  dep_lua,
-  dep_lua_records,
-  dep_netlibs,
-  dep_libsodium,
-  dep_libdecaf,
-  dep_libcrypto,
-  dep_libssl,
-  dep_gnutls,
-  dep_rt,
-  dep_boost,
-  dep_boost_program_options,
-  dep_unittests,
-  dep_backend_unittests,
-  dep_dlopen,
-  dep_pkcs11,
-  dep_gss_tsig,
-  dep_ixfrdist,
-  dep_yahttp,
-  dep_ipcrypt,
-  dep_json11,
-  dep_systemd,
-]
 subdir('pdns')
 
 pdns_auth = executable(

diff --git a/modules/bindbackend/meson.build b/modules/bindbackend/meson.build
index 5c582067fb7ae63a8f26dedd88a87cdd044bd37a..fcce91b2cdddbad59191d0cc3a1529413def4855 100644 (file)
--- a/modules/bindbackend/meson.build
+++ b/modules/bindbackend/meson.build
@@ -11,12 +11,12 @@ extras = [
   product_source_dir / 'pdns' / 'bind-dnssec.schema.sqlite3.sql',
 ]
 
-deps = [dep_pdns, dep_libcrypto, dep_boost]
+module_deps = [deps]
 
 lib = static_library(
   module_backend_name,
   sources,
-  dependencies: deps,
+  dependencies: module_deps,
   extra_files: extras,
 )
 

diff --git a/modules/geoipbackend/meson.build b/modules/geoipbackend/meson.build
index 58a569f4f23dedf862916dbf8d6e0b2a369ae234..f480e9e15fa48e04d49572e37fe247881e912be0 100644 (file)
--- a/modules/geoipbackend/meson.build
+++ b/modules/geoipbackend/meson.build
@@ -10,12 +10,12 @@ extras = [
   'geoipinterface.hh',
 ]
 
-deps = [dep_pdns, dep_geoip]
+module_deps = [deps, dep_geoip]
 
 lib = static_library(
   module_backend_name,
   sources,
-  dependencies: deps,
+  dependencies: module_deps,
   extra_files: extras,
 )
 

diff --git a/modules/gmysqlbackend/meson.build b/modules/gmysqlbackend/meson.build
index a8a51ed04caba8ef5f684f7af92036b67b1ee221..0d5d8044a4d65cf983d76a724c3dfbf8e2a6c386 100644 (file)
--- a/modules/gmysqlbackend/meson.build
+++ b/modules/gmysqlbackend/meson.build
@@ -17,12 +17,12 @@ extras = [
   'schema.mysql.sql',
 ]
 
-deps = [dep_pdns, dep_libcrypto, dep_libssl, dep_mysql]
+module_deps = [deps, dep_mysql]
 
 lib = static_library(
   module_backend_name,
   sources,
-  dependencies: deps,
+  dependencies: module_deps,
   extra_files: extras,
 )
 

diff --git a/modules/godbcbackend/meson.build b/modules/godbcbackend/meson.build
index f9e526f254178013a5014e1d6e5d94605426e6b7..9ce8a76d91297a3595733f0e60e2d387461c6554 100644 (file)
--- a/modules/godbcbackend/meson.build
+++ b/modules/godbcbackend/meson.build
@@ -13,12 +13,12 @@ extras = [
   '4.3.0_to_4.7.0_schema.mssql.sql',
 ]
 
-deps = [dep_pdns, dep_libcrypto, dep_odbc]
+module_deps = [deps, dep_odbc]
 
 lib = static_library(
   module_backend_name,
   sources,
-  dependencies: deps,
+  dependencies: module_deps,
   extra_files: extras,
 )
 

diff --git a/modules/gpgsqlbackend/meson.build b/modules/gpgsqlbackend/meson.build
index 65a22a49c6f42f031106407d8bbd3d2c02f75d91..80207a064fed7e7ed16d596825735fb81ccc5f95 100644 (file)
--- a/modules/gpgsqlbackend/meson.build
+++ b/modules/gpgsqlbackend/meson.build
@@ -16,12 +16,12 @@ extras = [
   '4.3.0_to_4.7.0_schema.pgsql.sql',
 ]
 
-deps = [dep_pdns, dep_libcrypto, dep_pgsql]
+module_deps = [deps, dep_pgsql]
 
 lib = static_library(
   module_backend_name,
   sources,
-  dependencies: deps,
+  dependencies: module_deps,
   extra_files: extras,
 )
 

diff --git a/modules/gsqlite3backend/meson.build b/modules/gsqlite3backend/meson.build
index 6e879015f069cd5186ec9d444cafaecc58dc4d32..14924e2d8be2058a6ac9b12c78308a00364bcd4b 100644 (file)
--- a/modules/gsqlite3backend/meson.build
+++ b/modules/gsqlite3backend/meson.build
@@ -15,11 +15,11 @@ extras = [
   'schema.sqlite3.sql',
 ]
 
-deps = [dep_pdns, dep_libcrypto, dep_sqlite3]
+module_deps = [deps, dep_sqlite3]
 lib = static_library(
   module_backend_name,
   sources,
-  dependencies: deps,
+  dependencies: module_deps,
   extra_files: extras,
 )
 

diff --git a/modules/ldapbackend/meson.build b/modules/ldapbackend/meson.build
index fa22dfe800e127caacc0dc1e59cf3d760e9d2faa..e62c46b6cd1ba8e0e147af6a0957b65574b55553 100644 (file)
--- a/modules/ldapbackend/meson.build
+++ b/modules/ldapbackend/meson.build
@@ -20,12 +20,12 @@ extras = [
   'pdns-domaininfo.schema',
 ]
 
-deps = [dep_pdns, dep_libcrypto, dep_ldap]
+module_deps = [deps, dep_ldap]
 
 lib = static_library(
   module_backend_name,
   sources,
-  dependencies: deps,
+  dependencies: module_deps,
   extra_files: extras,
 )
 

diff --git a/modules/lmdbbackend/meson.build b/modules/lmdbbackend/meson.build
index b03a0552ecbff8311b5f4f9a97f20a188d943773..424b62a396b7f153c06946a37988308c8f644668 100644 (file)
--- a/modules/lmdbbackend/meson.build
+++ b/modules/lmdbbackend/meson.build
@@ -6,12 +6,12 @@ extras = [
   'lmdbbackend.hh',
 ]
 
-deps = [dep_pdns, dep_lmdb_safe, dep_lmdb, dep_boost_serialization]
+module_deps = [deps, dep_lmdb_safe, dep_lmdb, dep_boost_serialization]
 
 lib = static_library(
   module_backend_name,
   sources,
-  dependencies: deps,
+  dependencies: module_deps,
   extra_files: extras,
 )
 

diff --git a/modules/lua2backend/meson.build b/modules/lua2backend/meson.build
index 304ec25789fd5cfb7971a0c6ff9f012b2bb59da3..f2c29b3875fd325d0157330b829e08127da37edb 100644 (file)
--- a/modules/lua2backend/meson.build
+++ b/modules/lua2backend/meson.build
@@ -8,12 +8,12 @@ extras = [
   'lua2api2.hh',
 ]
 
-deps = [dep_pdns, dep_libcrypto, dep_lua]
+module_deps = [deps]
 
 lib = static_library(
   module_backend_name,
   sources,
-  dependencies: deps,
+  dependencies: module_deps,
   extra_files: extras,
 )
 

diff --git a/modules/pipebackend/meson.build b/modules/pipebackend/meson.build
index 1cb6cd051b36b67979eb49e6dd56794297541709..332ff8e43e3f0ab277a0716e08173d1c93d39e77 100644 (file)
--- a/modules/pipebackend/meson.build
+++ b/modules/pipebackend/meson.build
@@ -10,12 +10,12 @@ extras = [
   'backend.pl',
 ]
 
-deps = [dep_pdns, dep_libcrypto, dep_boost]
+module_deps = [deps]
 
 lib = static_library(
   module_backend_name,
   sources,
-  dependencies: deps,
+  dependencies: module_deps,
   extra_files: extras,
 )
 

diff --git a/modules/remotebackend/meson.build b/modules/remotebackend/meson.build
index 5ee4c5ae6996bff3be7a9957d8ccbda65cbd5b15..aa9a74cbb0d5c2777714520684916b7b3a8756d9 100644 (file)
--- a/modules/remotebackend/meson.build
+++ b/modules/remotebackend/meson.build
@@ -25,21 +25,12 @@ extras = [
   'remotebackend.hh',
 ]
 
-deps = [
-  dep_pdns,
-  dep_yahttp,
-  dep_json11,
-  dep_zeromq,
-  dep_lua,
-  dep_libsodium,
-  dep_threads,
-  dep_arc4random,
-]
+module_deps = [deps, dep_zeromq]
 
 lib = static_library(
   module_backend_name,
   sources,
-  dependencies: deps,
+  dependencies: module_deps,
   extra_files: extras,
 )
 

diff --git a/modules/tinydnsbackend/meson.build b/modules/tinydnsbackend/meson.build
index cd356bef55e3cfc3662c101b4dcb122c4840c579..d28935a1bd9e6f500ac985cf85f8a51062647d99 100644 (file)
--- a/modules/tinydnsbackend/meson.build
+++ b/modules/tinydnsbackend/meson.build
@@ -9,12 +9,12 @@ extras = [
   product_source_dir / 'pdns' / 'cdb.hh',
 ]
 
-deps = [dep_pdns, dep_cdb]
+module_deps = [deps, dep_cdb]
 
 lib = static_library(
   module_backend_name,
   sources,
-  dependencies: deps,
+  dependencies: module_deps,
   extra_files: extras,
 )