From 147462b276fd8d1b5207f32ea791ec2be76398ea Mon Sep 17 00:00:00 2001
From: Arnaud Rebillout <arnaud.rebillout@collabora.com>
Date: Sat, 22 Sep 2018 16:17:43 +0700
Subject: [PATCH] meson: Do not build dbus files as a library

Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
---
 src/modules/dbus/meson.build | 34 ----------------------------------
 src/modules/meson.build      | 16 ++++++++++++++--
 2 files changed, 14 insertions(+), 36 deletions(-)
 delete mode 100644 src/modules/dbus/meson.build

diff --git a/src/modules/dbus/meson.build b/src/modules/dbus/meson.build
deleted file mode 100644
index 57c2127..0000000
--- a/src/modules/dbus/meson.build
+++ /dev/null
@@ -1,34 +0,0 @@
-libdbus_util_sources = [
-  'iface-card.c',
-  'iface-card-profile.c',
-  'iface-client.c',
-  'iface-core.c',
-  'iface-device.c',
-  'iface-device-port.c',
-  'iface-memstats.c',
-  'iface-module.c',
-  'iface-sample.c',
-  'iface-stream.c',
-]
-
-libdbus_util_headers = [
-  'iface-card.h',
-  'iface-card-profile.h',
-  'iface-client.h',
-  'iface-core.h',
-  'iface-device.h',
-  'iface-device-port.h',
-  'iface-memstats.h',
-  'iface-module.h',
-  'iface-sample.h',
-  'iface-stream.h',
-]
-
-libdbus_util = shared_library('libdbus_util',
-  libdbus_util_sources,
-  libdbus_util_headers,
-  c_args : [pa_c_args, server_c_args],
-  include_directories : [configinc, topinc],
-  dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep],
-  install : true
-)
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 84072e6..2cb305b 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -107,9 +107,21 @@ if avahi_dep.found()
 endif
 
 if dbus_dep.found()
-  subdir('dbus')
   all_modules += [
-    [ 'module-dbus-protocol', 'dbus/module-dbus-protocol.c', [], [], [dbus_dep], libdbus_util ],
+    [ 'module-dbus-protocol',
+      [ 'dbus/iface-card.c', 'dbus/iface-card.h',
+	'dbus/iface-card-profile.c', 'dbus/iface-card-profile.h',
+	'dbus/iface-client.c', 'dbus/iface-client.h',
+	'dbus/iface-core.c', 'dbus/iface-core.h',
+	'dbus/iface-device.c', 'dbus/iface-device.h',
+	'dbus/iface-device-port.c', 'dbus/iface-device-port.h',
+	'dbus/iface-memstats.c', 'dbus/iface-memstats.h',
+	'dbus/iface-module.c', 'dbus/iface-module.h',
+	'dbus/iface-sample.c', 'dbus/iface-sample.h',
+	'dbus/iface-stream.c', 'dbus/iface-stream.h',
+	'dbus/module-dbus-protocol.c',
+      ],
+      [], [], [dbus_dep] ]
   ]
 endif
 
-- 
2.7.4