From 32b8df441782eccf14863c1d0e3e8771c353a87c Mon Sep 17 00:00:00 2001
From: Nedko Arnaudov <nedko@nedk.org>
Date: Sun, 27 Aug 2023 20:51:42 +0300
Subject: [PATCH] Update meson to match wscript state

---
 common/meson.build              |  1 +
 daemon/meson.build              |  3 +--
 gui/meson.build                 |  4 +++-
 lash_compat/liblash/meson.build |  4 ++--
 meson.build                     | 15 ++++++---------
 meson_options.txt               |  1 -
 proxies/meson.build             |  2 +-
 7 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/common/meson.build b/common/meson.build
index 8ff41b84..8549f280 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -7,5 +7,6 @@ common_sources = [
 ]
 
 commonlib = static_library('common', common_sources,
+                           dependencies : [dbus_dep, cdbus_dep],
                            include_directories : inc,
                            install : false)
diff --git a/daemon/meson.build b/daemon/meson.build
index 42b22281..1fca4ed8 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -39,7 +39,6 @@ daemon_sources = [
   'room_load.c',
   'room_save.c',
   'save.c',
-  'siginfo.c',
   'studio.c',
   'studio_jack_conf.c',
   'studio_list.c',
@@ -50,5 +49,5 @@ daemon_sources = [
 ladishd = executable('ladishd', daemon_sources,
                      dependencies : deps,
                      include_directories : inc,
-                     link_with : [commonlib, cdbuslib, proxieslib, alsapidlib],
+                     link_with : [commonlib, proxieslib, alsapidlib],
                      install : true)
diff --git a/gui/meson.build b/gui/meson.build
index d78815a0..82153115 100644
--- a/gui/meson.build
+++ b/gui/meson.build
@@ -1,5 +1,7 @@
 gui_deps = [
   dependency('dbus-glib-1'),
+  dbus_dep,
+  cdbus_dep,
 ]
 
 subdir('flowcanvas')
@@ -38,7 +40,7 @@ gladish_sources = [
 gladish = executable('gladish', gladish_sources,
                      dependencies : [gui_deps, flowcanvas_deps],
                      include_directories : [flowcanvas_inc, inc],
-                     link_with : [flowcanvaslib, proxieslib, cdbuslib, commonlib],
+                     link_with : [flowcanvaslib, proxieslib, commonlib],
                      install : true)
 
 install_data('gladish.ui', install_dir : data_dir)
diff --git a/lash_compat/liblash/meson.build b/lash_compat/liblash/meson.build
index 7a1831e6..0c25e449 100644
--- a/lash_compat/liblash/meson.build
+++ b/lash_compat/liblash/meson.build
@@ -9,8 +9,8 @@ install_headers([
 
 liblash = library('lash', 'lash.c',
                   include_directories : [lash_inc, inc],
-                  dependencies : [dbus_dep],
-                  link_with : [cdbuslib, commonlib],
+                  dependencies : [dbus_dep, cdbus_dep],
+                  link_with : [commonlib],
                   install : true)
 
 pkg_mod.generate(libraries : liblash,
diff --git a/meson.build b/meson.build
index 1a1841ea..e3364d6f 100644
--- a/meson.build
+++ b/meson.build
@@ -32,13 +32,15 @@ cc = meson.get_compiler('c')
 inc = include_directories(meson.build_root().split('/')[-1])
 lash_inc = include_directories('lash_compat/liblash')
 
-dbus_dep = dependency('dbus-1')
 jack_dep = dependency('jack')
+dbus_dep = dependency('dbus-1')
+cdbus_dep = dependency('cdbus-1')
 
 deps = [
   cc.find_library('dl'),
   cc.find_library('util'),
   dbus_dep,
+  cdbus_dep,
   jack_dep,
   dependency('alsa'),
   dependency('uuid'),
@@ -49,7 +51,6 @@ pkg_mod = import('pkgconfig')
 
 subdir('common')
 subdir('proxies')
-subdir('cdbus')
 subdir('alsapid')
 
 # ladishd
@@ -59,26 +60,22 @@ if get_option('liblash').enabled()
   subdir('lash_compat/liblash')
 endif
 
-if get_option('pylash').enabled()
-  subdir('lash_compat/pylash')
-endif
-
 if get_option('gladish').enabled()
   subdir('gui')
   subdir('art')
 endif
 
-install_data(['AUTHORS', 'README', 'NEWS'], install_dir : data_dir)
+install_data(['AUTHORS', 'README.adoc', 'NEWS'], install_dir : data_dir)
 
 install_data('ladish_control',
              install_dir : get_option('prefix') / 'bin')
 
 jmcore = executable('jmcore', 'jmcore.c',
                     dependencies : deps,
-                    link_with : [commonlib, cdbuslib],
+                    link_with : [commonlib],
                     install : true)
 
 ladiconfd = executable('ladiconfd', 'conf.c',
                        dependencies : deps,
-                       link_with : [commonlib, cdbuslib],
+                       link_with : [commonlib],
                        install : true)
diff --git a/meson_options.txt b/meson_options.txt
index e01b59c4..592354a1 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,2 @@
 option('liblash', type : 'feature')
-option('pylash', type : 'feature')
 option('gladish', type : 'feature')
diff --git a/proxies/meson.build b/proxies/meson.build
index aef9f92b..854778cb 100644
--- a/proxies/meson.build
+++ b/proxies/meson.build
@@ -14,5 +14,5 @@ proxies_sources = [
 
 proxieslib = static_library('proxies', proxies_sources,
                             include_directories : inc,
-                            dependencies : dbus_dep,
+                            dependencies : [dbus_dep, cdbus_dep,],
                             install : false)