From f6d9eeb99a55e5dcfd3a943fcea9dfafaa993d1b Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Thu, 27 Jul 2017 17:50:37 +0900 Subject: [PATCH] meson - clock and ibar - use same template as most modules now --- src/modules/clock/meson.build | 45 ++++++++++++++++++---------------- src/modules/ibar/meson.build | 46 ++++++++++++++++++----------------- 2 files changed, 48 insertions(+), 43 deletions(-) diff --git a/src/modules/clock/meson.build b/src/modules/clock/meson.build index 8fc730244..7d475d491 100644 --- a/src/modules/clock/meson.build +++ b/src/modules/clock/meson.build @@ -1,29 +1,32 @@ -clock_dist = [ - 'e-module-clock.edj', - 'module.desktop', +module = 'clock' +opt = 'clock' +conf = 'USE_MODULE_CLOCK' + +src = [ + 'e_mod_main.c', + 'e_mod_config.c', + 'e_mod_main.h' ] -clock_src = [ - 'e_mod_config.c', - 'e_mod_main.c' +icon = [ + 'e-module-' + module + '.edj', + 'module.desktop' ] -clock_dir = join_paths(dir_module_e, 'clock', module_arch) -if get_option('clock') == true - config_h.set('USE_MODULE_CLOCK', '1') +dir_mod = join_paths(dir_module_e, module) +dir_mod_bin = join_paths(dir_mod, module_arch) - install_data(clock_dist, - install_dir: join_paths(dir_module_e, 'clock') - ) +if get_option(opt) == true + config_h.set(conf, '1') + module_files += join_paths(dir_mod_bin, module + '.so') - module_files += join_paths(clock_dir, 'clock.so') - shared_module('clock', - clock_src, + install_data(icon, install_dir: dir_mod) + + shared_module(module, src, include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: clock_dir, - install: true - ) + name_prefix : '', + dependencies : module_deps, + install_dir : dir_mod_bin, + install : true + ) endif - diff --git a/src/modules/ibar/meson.build b/src/modules/ibar/meson.build index f5bffbffe..eac5d8942 100644 --- a/src/modules/ibar/meson.build +++ b/src/modules/ibar/meson.build @@ -1,30 +1,32 @@ -ibar_dist = [ - 'e-module-ibar.edj', - 'module.desktop', +module = 'ibar' +opt = 'ibar' +conf = 'USE_MODULE_IBAR' + +src = [ + 'e_mod_main.c', + 'e_mod_config.c', + 'e_mod_main.h' ] -ibar_src = [ - 'e_mod_config.c', - 'e_mod_main.c', - 'e_mod_main.h', +icon = [ + 'e-module-' + module + '.edj', + 'module.desktop' ] -ibar_dir = join_paths(dir_module_e, 'ibar', module_arch) -if get_option('ibar') == true - config_h.set('USE_MODULE_IBAR', '1') +dir_mod = join_paths(dir_module_e, module) +dir_mod_bin = join_paths(dir_mod, module_arch) - install_data(ibar_dist, - install_dir: join_paths(dir_module_e, 'ibar') - ) +if get_option(opt) == true + config_h.set(conf, '1') + module_files += join_paths(dir_mod_bin, module + '.so') - module_files += join_paths(ibar_dir, 'ibar.so') - shared_module('ibar', - ibar_src, + install_data(icon, install_dir: dir_mod) + + shared_module(module, src, include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: ibar_dir, - install: true - ) + name_prefix : '', + dependencies : module_deps, + install_dir : dir_mod_bin, + install : true + ) endif -