Meson: Rework how ext/ is handled

diff --git a/ext/meson.build b/ext/meson.build
deleted file mode 100644 (file)
index 9043be5..0000000
--- a/ext/meson.build
+++ /dev/null
@@ -1,3 +0,0 @@
-foreach module: ext_modules
-  subdir(module)
-endforeach

diff --git a/meson.build b/meson.build
index 17aefe8592583238029093df1dc5d842f3b8c008..2e0a7c72d54f341b4d426c848f1c840b326e9ca7 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -95,18 +95,15 @@ subdir('meson' / 'cxx-fs')                  # C++ stdlib Filesystem Module
 # TODO Generate pdns_server.1 manpage
 
 # Ext
-ext_modules = [
-  'arc4random',
-  'ipcrypt',
-  'json11',
-  'luawrapper',
-  'protozero',
-  'yahttp',
-]
+subdir('ext' / 'arc4random')
+subdir('ext' / 'ipcrypt')
+subdir('ext' / 'json11')
+subdir('ext' / 'luawrapper')
+subdir('ext' / 'protozero')
+subdir('ext' / 'yahttp')
 if get_option('module-lmdb') != 'disabled'
-  ext_modules += 'lmdb-safe'
+  subdir('ext' / 'lmdb-safe')
 endif
-subdir('ext')
 
 deps = [
   dep_pdns,