From 1caa1405034bf280248b501897b794c39aa72de5 Mon Sep 17 00:00:00 2001
From: Marcel Hollerbach <marcel-hollerbach@t-online.de>
Date: Tue, 8 Aug 2017 18:21:04 +0200
Subject: [PATCH] meson: port music-control

---
 src/modules/meson.build               |  2 +-
 src/modules/music-control/meson.build | 52 ++++++++-------------------
 2 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/src/modules/meson.build b/src/modules/meson.build
index 11d713a77..2d0f511d4 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -4,7 +4,6 @@ subdir('wizard')
 subdir('mixer')
 subdir('everything')
 subdir('teamwork')
-subdir('music-control')
 subdir('wl_desktop_shell')
 subdir('wl_text_input')
 subdir('wl_weekeyboard')
@@ -29,6 +28,7 @@ mods = [
   'fileman_opinfo',
   'conf',
   'msgbus',
+  'music-control',
   'conf_applications',
   'conf_shelves',
   'conf_window_remembers',
diff --git a/src/modules/music-control/meson.build b/src/modules/music-control/meson.build
index d1fc0843b..ffe933619 100644
--- a/src/modules/music-control/meson.build
+++ b/src/modules/music-control/meson.build
@@ -1,44 +1,22 @@
-module = 'music_control'
-opt    = 'music-control'
-conf   = 'USE_MODULE_MUSIC_CONTROL'
+created_file = [
+  'eldbus_media_player2_player.c',
+  'eldbus_mpris_media_player2.c',
+  'eldbus_media_player2_player.h',
+  'eldbus_mpris_media_player2.h',
+  'eldbus_utils.h'
+]
 
-src = [
+src = [files(
   'e_mod_main.c',
   'ui.c',
   'e_mod_main.h',
   'private.h'
-]
-
-icon = [
-  'e-module-' + module + '.edj',
-  'module.desktop'
-]
-
-dir_mod     = join_paths(dir_module_e, module)
-dir_mod_bin = join_paths(dir_mod, module_arch)
-
-if get_option(opt) == true
-  config_h.set(conf, '1')
-  module_files += join_paths(dir_mod_bin, module + '.so')
+)]
 
-  install_data(icon, install_dir: dir_mod)
+src += custom_target('gen-dbus',
+                     input  : 'introspect.xml',
+                     command: [eldbus_codegen, '@INPUT@', '-O', '@OUTDIR@'],
+                     output : created_file
+                    )
 
-  gen_dbus = custom_target('gen-dbus',
-                           input  : 'introspect.xml',
-                           command: [eldbus_codegen, '@INPUT@', '-O', '@OUTDIR@'],
-                           output : [
-                             'eldbus_media_player2_player.c',
-                             'eldbus_mpris_media_player2.c',
-                             'eldbus_media_player2_player.h',
-                             'eldbus_mpris_media_player2.h',
-                             'eldbus_utils.h'
-                             ]
-                            )
-  shared_module(module, [src, gen_dbus] ,
-                include_directories: include_directories(module_includes),
-                name_prefix        : '',
-                dependencies       : module_deps,
-                install_dir        : dir_mod_bin,
-                install            : true
-               )
-endif
+no_icon = true