Meson: Replace toplevel_includes with a proper dependency

diff --git a/meson.build b/meson.build
index 15c736abbb2544b45c517df07fafbc925364ac2b..f8b6b8b4ef765d7fce7e0e46db130183dfc66a8b 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -24,9 +24,8 @@ fs = import('fs')
 conf = configuration_data()
 deps = []
 
-# TODO Get rid of this by passing library objects instead of include directories to
-# e.g. modules.
-toplevel_includes = include_directories('.', 'pdns')
+# Toplevel includes
+dep_pdns = declare_dependency(include_directories: include_directories('.', 'pdns'))
 
 subdir('meson' / 'config')                  # Config
 subdir('meson' / 'version')                 # Generate version define

diff --git a/pdns/meson.build b/pdns/meson.build
index cb18b3c8f21b2f72ae7fd19e4444400556c6093a..d10c22aa904b4de6649fb46ec6b0d3f56e4db96b 100644 (file)
--- a/pdns/meson.build
+++ b/pdns/meson.build
@@ -5,7 +5,7 @@ libpdns_bindparser = declare_dependency(
     'zoneparser-tng.hh',
     flex_generator.process('bindlexer.l'),
     bison_generator.process('bindparser.yy'),
-    include_directories: toplevel_includes,
+    dependencies: [dep_pdns],
     cpp_args: '-Wno-redundant-decls',
   )
 )
@@ -28,8 +28,7 @@ if opt_lua_records
     'lua-record.cc',
     'minicurl.cc',
     'minicurl.hh',
-    include_directories: toplevel_includes,
-    dependencies: [dep_lua, dep_libcurl],
+    dependencies: [dep_pdns, dep_lua, dep_libcurl],
   )
 
   libpdns_lua_records = declare_dependency(
@@ -48,8 +47,7 @@ if dep_gss_tsig.found()
     'gss_context.cc',
     'gss_context.hh',
     cpp_args: '-Wno-redundant-decls',
-    include_directories: toplevel_includes,
-    dependencies: dep_gss_tsig,
+    dependencies: [dep_pdns, dep_gss_tsig],
   )
 
   libpdns_tsig = declare_dependency(
@@ -63,8 +61,7 @@ if dep_pkcs11.found()
     'libpdns-pkcs11',
     'pkcs11signers.cc',
     'pkcs11signers.hh',
-    include_directories: toplevel_includes,
-    dependencies: dep_pkcs11,
+    dependencies: [dep_pdns, dep_pkcs11],
   )
 
   libpdns_pkcs11 = declare_dependency(
@@ -80,8 +77,7 @@ libpdns_ws = declare_dependency(
     'ws-api.cc',
     'ws-api.hh',
     cpp_args: '-Wno-overloaded-virtual',
-    include_directories: toplevel_includes,
-    dependencies: [dep_yahttp, dep_json11],
+    dependencies: [dep_pdns, dep_yahttp, dep_json11],
   )
 )
 
@@ -221,8 +217,8 @@ libpdns = static_library(
   'version.hh',
   'zoneparser-tng.cc',
   ragel_generator.process('dnslabeltext.rl'),
-  include_directories: toplevel_includes,
   dependencies: [
+    dep_pdns,
     dep_json11,
     dep_yahttp,
     libpdns_bindparser,
@@ -240,8 +236,8 @@ libpdns_auth_main = declare_dependency(
     'auth-main.cc',
     'auth-main.hh',
     cpp_args: '-Wno-overloaded-virtual',
-    include_directories: toplevel_includes,
     dependencies: [
+      dep_pdns,
       dep_yahttp,
       dep_json11,
       dep_systemd,
@@ -256,8 +252,7 @@ libpdns_auth_ws = declare_dependency(
     'ws-auth.cc',
     'ws-auth.hh',
     cpp_args: '-Wno-overloaded-virtual',
-    include_directories: toplevel_includes,
-    dependencies: [dep_yahttp, dep_json11],
+    dependencies: [dep_pdns, dep_yahttp, dep_json11],
   )
 )
 
@@ -267,8 +262,7 @@ if dep_lua.found()
     'libpdns-auth-lua',
     'lua-auth4.cc',
     'lua-auth4.hh',
-    include_directories: toplevel_includes,
-    dependencies: libpdns_lua,
+    dependencies: [dep_pdns, libpdns_lua],
   )
 
   libpdns_auth_lua = declare_dependency(
@@ -292,8 +286,8 @@ libpdns_auth = static_library(
   'responsestats-auth.cc',
   'secpoll-auth.cc',
   'secpoll-auth.hh',
-  include_directories: toplevel_includes,
   dependencies: [
+    dep_pdns,
     libpdns_auth_lua,
     libpdns_auth_main,
     libpdns_auth_ws,