kr_cache_gc: build with meson

diff --git a/meson.build b/meson.build
index 4d901fbb9b60bcebe15c4babff5dccdd13839a6e..6fddaa8060adad76305c4264a15b7a3b92c26d43 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -158,6 +158,7 @@ subdir('lib')
 subdir('client')
 subdir('daemon')
 subdir('modules')
+subdir('utils')
 if get_option('bench') == 'enabled'
   subdir('bench')
 endif
@@ -243,6 +244,7 @@ run_target(
 s_managed_ta = managed_ta ? 'enabled' : 'disabled'
 s_systemd_socket = libsystemd.found() ? 'enabled' : 'disabled'
 s_build_client = build_client ? 'enabled' : 'disabled'
+s_build_utils = build_utils ? 'enabled' : 'disabled'
 s_build_dnstap = build_dnstap ? 'enabled' : 'disabled'
 s_build_unit_tests = build_unit_tests ? 'enabled' : 'disabled'
 s_build_config_tests = build_config_tests ? 'enabled' : 'disabled'
@@ -270,6 +272,7 @@ message('''
 
   optional components
     client:             @0@'''.format(s_build_client) + '''
+    utils:              @0@'''.format(s_build_utils) + '''
     dnstap:             @0@'''.format(s_build_dnstap) + '''
     unit_tests:         @0@'''.format(s_build_unit_tests) + '''
     config_tests:       @0@'''.format(s_build_config_tests) + '''

diff --git a/meson_options.txt b/meson_options.txt
index 5a08e1b847c2a9a30b2dc322740268faf877e6d4..bdb6fdf9dfa8434d61dc724b8efa19b43321e503 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -102,6 +102,18 @@ option(
   description: 'build kresc client binary',
 )
 
+option(
+  'utils',
+  type: 'combo',
+  choices: [
+    'auto',
+    'enabled',
+    'disabled',
+  ],
+  value: 'auto',
+  description: 'build kres utilities',
+)
+
 option(
   'dnstap',
   type: 'combo',

diff --git a/utils/kr_cache_gc/Makefile b/utils/kr_cache_gc/Makefile
deleted file mode 100644 (file)
index 99c6308..0000000
--- a/utils/kr_cache_gc/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-
-all: kr_cache_gc
-
-kr_cache_gc: kr_cache_gc.o categories.o db.o main.c kr_cache_gc.h ../../lib/defines.h
-       gcc -std=gnu99 -o $@ main.c kr_cache_gc.o categories.o db.o -Wl,-Bdynamic -L../../lib -lknot -lkres -I../..
-
-kr_cache_gc.o: kr_cache_gc.c kr_cache_gc.h categories.h db.h ../../contrib/dynarray.h ../../lib/defines.h ../../lib/cache/api.h ../../lib/cache/impl.h
-       gcc -std=gnu99 -o $@ -c $< -I../.. -I../../contrib -I/usr/include/luajit-2.0
-
-categories.o: categories.c categories.h kr_cache_gc.h
-       gcc -std=gnu99 -o $@ -c $<
-
-db.o: db.c db.h kr_cache_gc.h
-        gcc -std=gnu99 -o $@ -c $< -I../.. -I../../contrib -I/usr/include/luajit-2.0
-
-clean:
-       rm -f kr_cache_gc kr_cache_gc.o categories.o db.o
-

diff --git a/utils/kr_cache_gc/meson.build b/utils/kr_cache_gc/meson.build
new file mode 100644 (file)
index 0000000..c762fac
--- /dev/null
+++ b/utils/kr_cache_gc/meson.build
@@ -0,0 +1,21 @@
+## utils/kr_cache_gc
+
+kr_cache_gc_src = files([
+  'categories.c',
+  'db.c',
+  'kr_cache_gc.c',
+  'main.c',
+])
+
+kr_cache_gc = executable(
+  'kr_cache_gc',
+  kr_cache_gc_src,
+  dependencies: [
+    contrib_dep,
+    libkres_dep,
+    libknot,
+    luajit_inc,
+  ],
+  install: true,
+  install_dir: get_option('sbindir'),
+)

diff --git a/utils/meson.build b/utils/meson.build
new file mode 100644 (file)
index 0000000..8a5cd2b
--- /dev/null
+++ b/utils/meson.build
@@ -0,0 +1,6 @@
+# utils
+
+build_utils = get_option('utils') != 'disabled'
+if build_utils
+  subdir('kr_cache_gc')
+endif

diff --git a/utils/utils.mk b/utils/utils.mk
deleted file mode 100644 (file)
index 4524f46..0000000
--- a/utils/utils.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-
-utils: kr_cache_gc
-
-kr_cache_gc:
-       make -C utils/kr_cache_gc all
-
-.PHONY: utils kr_cache_gc
-