From: Aleš <ales.mrazek@nic.cz>
Date: Fri, 24 Jul 2020 14:09:07 +0000 (+0200)
Subject: sysrepo: meson files cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bf56bccb1943ba3976cbc3d1fd7db6e6fd529e9;p=thirdparty%2Fknot-resolver.git

sysrepo: meson files cleanup
---

diff --git a/meson.build b/meson.build
index 2b710c9bc..c4b6cf46c 100644
--- a/meson.build
+++ b/meson.build
@@ -128,22 +128,6 @@ else
 endif
 message('---------------------------')
 
-### Sysrepo
-message('--- sysrepo dependencies ---')
-libsysrepo = dependency('sysrepo', version: '>=1.4.2', required: false)
-libyang = dependency('libyang', version: '>=1.0.130', required: false)
-sysrepo = get_option('sysrepo')
-if (sysrepo == 'auto' or sysrepo == 'enabled') and libsysrepo.found() and libyang.found()
-  build_sysrepo = true
-elif sysrepo == 'enabled' and not libyang.found()
-  error('sysrepo=enabled requires libyang >= 1.0.130')
-elif sysrepo == 'enabled' and not libsysrepo.found()
-  error('sysrepo=enabled requires sysrepo >= 1.4.2')
-else
-  build_sysrepo = false
-endif
-message('---------------------------')
-
 ## Compiler args
 add_project_arguments(
   '-D_GNU_SOURCE',
diff --git a/utils/kresctl/main.c b/utils/kresctl/main.c
deleted file mode 100644
index d1f9a9643..000000000
--- a/utils/kresctl/main.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int main(int argc, char *argv[])
-{
-    return 0;
-}
\ No newline at end of file
diff --git a/utils/kresctl/meson.build b/utils/kresctl/meson.build
deleted file mode 100644
index 583548df5..000000000
--- a/utils/kresctl/meson.build
+++ /dev/null
@@ -1,22 +0,0 @@
-kresctl_src = files([
-    'main.c',
-])
-c_src_lint += kresctl_src
-
-if build_sysrepo
-    kresc = executable(
-    'kresctl',
-    kresctl_src,
-    sysrepo_common_src,
-    dependencies: [
-      contrib_dep,
-      libkres_dep,
-      libyang,
-      libsysrepo,
-      libknot,
-      luajit_inc,
-    ],
-    install: true,
-    install_dir: get_option('sbindir'),
-  )
-endif
\ No newline at end of file
diff --git a/utils/meson.build b/utils/meson.build
index 24c0e72d9..0b932d637 100644
--- a/utils/meson.build
+++ b/utils/meson.build
@@ -3,8 +3,7 @@
 
 build_utils = get_option('utils') != 'disabled'
 
-subdir('kresctl')
-subdir('kres_watcher')
+subdir('watcher')
 subdir('client')
 subdir('cache_gc')
 subdir('upgrade')
diff --git a/utils/kres_watcher/main.c b/utils/watcher/main.c
similarity index 100%
rename from utils/kres_watcher/main.c
rename to utils/watcher/main.c
diff --git a/utils/kres_watcher/meson.build b/utils/watcher/meson.build
similarity index 51%
rename from utils/kres_watcher/meson.build
rename to utils/watcher/meson.build
index a8fa67d4d..7ada22638 100644
--- a/utils/kres_watcher/meson.build
+++ b/utils/watcher/meson.build
@@ -1,22 +1,19 @@
-kres_watcher_src = files([
+watcher_src = files([
     'main.c',
 ])
-c_src_lint += kres_watcher_src
+c_src_lint += watcher_src
 
 if build_sysrepo
-    kres_watcher = executable(
+  watcher = executable(
     'kres-watcher',
-    kres_watcher_src,
+    watcher_src,
     sysrepo_common_src,
     dependencies: [
-      contrib_dep,
-      libkres_dep,
       libyang,
       libsysrepo,
-      libknot,
-      luajit_inc,
+      gnutls,
     ],
     install: true,
     install_dir: get_option('sbindir'),
   )
-endif
\ No newline at end of file
+endif