meson - clock and ibar - use same template as most modules now

This commit is contained in:
Carsten Haitzler 2017-07-27 17:50:37 +09:00
parent 30ed7e5f45
commit f6d9eeb99a
2 changed files with 48 additions and 43 deletions

View File

@ -1,29 +1,32 @@
clock_dist = [ module = 'clock'
'e-module-clock.edj', opt = 'clock'
'module.desktop', conf = 'USE_MODULE_CLOCK'
src = [
'e_mod_main.c',
'e_mod_config.c',
'e_mod_main.h'
] ]
clock_src = [ icon = [
'e_mod_config.c', 'e-module-' + module + '.edj',
'e_mod_main.c' 'module.desktop'
] ]
clock_dir = join_paths(dir_module_e, 'clock', module_arch) dir_mod = join_paths(dir_module_e, module)
if get_option('clock') == true dir_mod_bin = join_paths(dir_mod, module_arch)
config_h.set('USE_MODULE_CLOCK', '1')
install_data(clock_dist, if get_option(opt) == true
install_dir: join_paths(dir_module_e, 'clock') config_h.set(conf, '1')
) module_files += join_paths(dir_mod_bin, module + '.so')
module_files += join_paths(clock_dir, 'clock.so') install_data(icon, install_dir: dir_mod)
shared_module('clock',
clock_src, shared_module(module, src,
include_directories: include_directories(module_includes), include_directories: include_directories(module_includes),
name_prefix: '', name_prefix : '',
dependencies: module_deps, dependencies : module_deps,
install_dir: clock_dir, install_dir : dir_mod_bin,
install: true install : true
) )
endif endif

View File

@ -1,30 +1,32 @@
ibar_dist = [ module = 'ibar'
'e-module-ibar.edj', opt = 'ibar'
'module.desktop', conf = 'USE_MODULE_IBAR'
src = [
'e_mod_main.c',
'e_mod_config.c',
'e_mod_main.h'
] ]
ibar_src = [ icon = [
'e_mod_config.c', 'e-module-' + module + '.edj',
'e_mod_main.c', 'module.desktop'
'e_mod_main.h',
] ]
ibar_dir = join_paths(dir_module_e, 'ibar', module_arch) dir_mod = join_paths(dir_module_e, module)
if get_option('ibar') == true dir_mod_bin = join_paths(dir_mod, module_arch)
config_h.set('USE_MODULE_IBAR', '1')
install_data(ibar_dist, if get_option(opt) == true
install_dir: join_paths(dir_module_e, 'ibar') config_h.set(conf, '1')
) module_files += join_paths(dir_mod_bin, module + '.so')
module_files += join_paths(ibar_dir, 'ibar.so') install_data(icon, install_dir: dir_mod)
shared_module('ibar',
ibar_src, shared_module(module, src,
include_directories: include_directories(module_includes), include_directories: include_directories(module_includes),
name_prefix: '', name_prefix : '',
dependencies: module_deps, dependencies : module_deps,
install_dir: ibar_dir, install_dir : dir_mod_bin,
install: true install : true
) )
endif endif