meson: cleanup

diff --git a/daemon/lua/meson.build b/daemon/lua/meson.build
index d86a3afe89288eddfa8c7e971ef072a219761206..37839d38fc14373949e2b24384448542e028311d 100644 (file)
--- a/daemon/lua/meson.build
+++ b/daemon/lua/meson.build
@@ -1,4 +1,4 @@
-lua_sources_daemon = [
+lua_src_daemon = [
   'kres.lua',
   'kres-gen.lua',
   # trust_anchors.lua.in handled separately
@@ -6,9 +6,9 @@ lua_sources_daemon = [
 ]
 
 # install lua modules
-foreach mod : lua_sources_daemon
+foreach mod : lua_src_daemon
   install_data(
-    join_paths(mod),
+    mod,
     install_dir: modules_dir,
   )
 endforeach

diff --git a/daemon/meson.build b/daemon/meson.build
index 9df88bd9dc6d9e0472cb1c25bc11a0a50008b0c2..2c1490c080c29307df397e9b6a10227dd63a4050 100644 (file)
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -1,4 +1,4 @@
-kresd_sources = [
+kresd_src = [
   'bindings.c',
   'engine.c',
   'ffimodule.c',
@@ -62,7 +62,7 @@ if get_option('daemon')
   # build
   kresd = executable(
     'kresd',
-    kresd_sources, kresd_lua,
+    kresd_src, kresd_lua,
     dependencies: [
       contrib_dep,
       libkres_dep,

diff --git a/meson.build b/meson.build
index aa674ae28ba45cc95de20f7b1cc438eea37a41e6..0ce4a3b810ccd86ff3fb67f1401f80dd45ae6887 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -90,7 +90,6 @@ add_global_arguments(
 )
 
 
-
 subdir('contrib')
 subdir('lib')
 subdir('client')
@@ -99,58 +98,8 @@ subdir('modules')
 
 # TODO install man
 
-## modules
-
-
-#library(
-#  'bogus_log',
-#  ['modules/bogus_log/bogus_log.c'],
-#  dependencies: [
-#    contrib_dep,
-#    libkres_dep,
-#    libknot,
-#    luajit,
-#    libuv,
-#  ],
-#  install: true,
-#  install_dir: modules_dir,
-#  name_prefix: '',
-#)
-
-#library(
-#  'hints',
-#  ['modules/hints/hints.c'],
-#  dependencies: [
-#    contrib_dep,
-#    libkres_dep,
-#    luajit,
-#  ],
-#  install: true,
-#  install_dir: modules_dir,
-#  name_prefix: '',
-#)
-
-#library(
-#  'stats',
-#  ['modules/stats/stats.c'],
-#  dependencies: [
-#    contrib_dep,
-#    libkres_dep,
-#    luajit,
-#  ],
-#  install: true,
-#  install_dir: modules_dir,
-#  name_prefix: '',
-#)
-
-# TODO: dnstap
-
-
 # install
 
-
-
-
 # etc
 
 install_data(sources: 'etc/root.hints', install_dir: config.get('etc_dir'))

diff --git a/meson_options.txt b/meson_options.txt
index 037062bac47cc35f8bbc23e617062d287d072b18..2d4c557ed74f63cb81e686db6e28259e0eca51f0 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,3 @@
-option('cookies', type: 'boolean', value: false, description: 'Support for DNS Cookies.')
 option('client', type : 'boolean', value : true, description: 'kresc client binary')
 option('daemon', type: 'boolean', value: true, description: 'kresd daemon binary')
 option('modules_dir', type: 'string', description: 'path to kres modules directory')

diff --git a/modules/meson.build b/modules/meson.build
index f1d0bdd7598e17f40fb75f2d9e4cb6ba5cd971fb..c4be56aed1a689e6903b1f28db8693bfec21b00f 100644 (file)
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -1,4 +1,4 @@
-lua_sources = [
+lua_src = [
   'daf/daf.lua',
   'detect_time_jump/detect_time_jump.lua',
   'detect_time_skew/detect_time_skew.lua',
@@ -25,6 +25,7 @@ lua_sources = [
 
 
 subdir('bogus_log')
+# cookies module is not currently used
 subdir('daf')
 subdir('edns_keepalive')
 subdir('hints')
@@ -33,13 +34,10 @@ subdir('policy')
 subdir('stats')
 
 
-# TODO c modules
-
-
 # install lua modules
-foreach mod : lua_sources
+foreach mod : lua_src
   install_data(
-    join_paths(mod),
+    mod,
     install_dir: modules_dir,
   )
 endforeach