Meson: Toplevel includes

diff --git a/meson.build b/meson.build
index 5908b64f0f70dc478a0f75b9de680327f938d45c..b596e2240157e74280ccf79bf57eac2859a65811 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -97,6 +97,10 @@ if not fs.exists('docs' / 'pdns_server.1') and not python_have_venv
 endif
 # TODO Generate pdns_server.1 manpage
 
+# TODO Ultimately we should get rid of this by passing library objects instead of include
+# directories to e.g. modules.
+toplevel_includes = include_directories('.', 'pdns')
+
 # Modules
 all_modules = {
   'bind':     [],
@@ -118,7 +122,6 @@ foreach module_name, module_deps: all_modules
   module_backend_name = module_name + 'backend'
   module_opt = get_option('module-' + module_name)
   module_opt_dyn = get_option('module-' + module_name + '-dyn')
-  module_includes = include_directories('.', 'pdns')
 
   if module_name == 'remote' and (module_opt != 'disabled' or module_opt_dyn != 'disabled')
     set_variable(module_name + '_module', module_opt != 'disabled')

diff --git a/modules/bindbackend/meson.build b/modules/bindbackend/meson.build
index 3eac49ece4d6d3bca081c4277be1d08efbaa6d12..3d9144c6c8b646dedd6ea6aa52ea73906a49400e 100644 (file)
--- a/modules/bindbackend/meson.build
+++ b/modules/bindbackend/meson.build
@@ -18,9 +18,9 @@ module_docs = [
 ]
 
 if get_variable(module_name + '_module')
-  static_library(module_backend_name, module_sources, include_directories: module_includes, dependencies: dep_libcrypto, extra_files: module_docs)
+  static_library(module_backend_name, module_sources, include_directories: toplevel_includes, dependencies: dep_libcrypto, extra_files: module_docs)
 endif
 
 if get_variable(module_name + '_dyn_module')
-  shared_library(module_backend_name, module_sources, include_directories: module_includes, dependencies: dep_libcrypto, extra_files: module_docs)
+  shared_library(module_backend_name, module_sources, include_directories: toplevel_includes, dependencies: dep_libcrypto, extra_files: module_docs)
 endif

diff --git a/modules/lua2backend/meson.build b/modules/lua2backend/meson.build
index e6e49181de3bc7b41943b44bb7799f672c13167f..ea8a649b57d8490280c150c62f1b3d6d5195c2c0 100644 (file)
--- a/modules/lua2backend/meson.build
+++ b/modules/lua2backend/meson.build
@@ -9,7 +9,7 @@ module_sources = [
 ]
 
 if get_variable(module_name + '_module')
-  static_library(module_backend_name, module_sources, include_directories: module_includes, dependencies: [dep_libcrypto, dep_lua])
+  static_library(module_backend_name, module_sources, include_directories: toplevel_includes, dependencies: [dep_libcrypto, dep_lua])
 endif
 
 if get_variable(module_name + '_dyn_module')