raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=397e21d0de067ab7623bb8427e2a688f482882f5
commit 397e21d0de067ab7623bb8427e2a688f482882f5 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Sat Aug 12 12:25:53 2017 +0900 meson build - simplify wizard module build like others --- src/modules/meson.build | 12 +++--- src/modules/wizard/meson.build | 91 ++++++++++++++++-------------------------- 2 files changed, 42 insertions(+), 61 deletions(-) diff --git a/src/modules/meson.build b/src/modules/meson.build index 8cd57c7dd..56586fdff 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -4,16 +4,11 @@ module_includes = [ '../../..', '../../bin', '../../bin/efx' ] module_includes2 = [ '../..' , '../bin' , '../bin/efx' ] module_deps = [ deps_e, dep_dl ] -subdir('wizard') subdir('mixer') subdir('everything') mods = [ # standard run of the mill modules with cion and desktop - 'battery', - 'cpufreq', - 'clock', - 'sysinfo', 'ibar', 'pager', 'pager_plain', @@ -55,6 +50,13 @@ mods = [ 'time', 'luncher', 'teamwork', +# modules have a custom binary as well + 'battery', + 'cpufreq', + 'clock', + 'sysinfo', +# custyom sub modules and custom data + 'wizard', # also standard modules, just with only a desktop file using a generic icon 'conf_theme', 'conf_intl', diff --git a/src/modules/wizard/meson.build b/src/modules/wizard/meson.build index fda7db1e7..83acfa37e 100644 --- a/src/modules/wizard/meson.build +++ b/src/modules/wizard/meson.build @@ -1,72 +1,51 @@ -module = 'wizard' -opt = 'wizard' -conf = 'USE_MODULE_WIZARD' - src = files( 'e_mod_main.c', 'e_wizard.c', 'e_wizard.h' ) -pages = [ - 'page_000', - 'page_010', - 'page_011', - 'page_020', - 'page_030', - 'page_040', - 'page_050', - 'page_060', - 'page_065', - 'page_070', - 'page_080', - 'page_090', - 'page_100', - 'page_110', - 'page_120', - 'page_130', - 'page_150', - 'page_160', - 'page_170', - 'page_180', - 'page_200' -] - -ibar_def = [ - 'data/def-ibar.txt' -] - -desktops = [ - 'data/desktop/home.desktop', - 'data/desktop/root.desktop', - 'data/desktop/tmp.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(ibar_def, install_dir: dir_mod) - install_data(desktops, install_dir: join_paths(dir_mod, 'desktop')) - - shared_module(module, src, - include_directories: include_directories(module_includes), - name_prefix : '', - dependencies : module_deps, - install_dir : dir_mod_bin, - install : true - ) +if get_option(m) == true + pages = [ + 'page_000', + 'page_010', + 'page_011', + 'page_020', + 'page_030', + 'page_040', + 'page_050', + 'page_060', + 'page_065', + 'page_070', + 'page_080', + 'page_090', + 'page_100', + 'page_110', + 'page_120', + 'page_130', + 'page_150', + 'page_160', + 'page_170', + 'page_180', + 'page_200' + ] foreach page: pages shared_module(page, '@[email protected]'.format(page), include_directories: include_directories(module_includes), name_prefix : '', dependencies : module_deps, - install_dir : dir_mod_bin, + install_dir : _dir_bin, install : true ) endforeach + + data = [ + 'data/def-ibar.txt' + ] + install_data(['data/desktop/home.desktop', + 'data/desktop/root.desktop', + 'data/desktop/tmp.desktop'], + install_dir: join_paths(_dir, 'desktop')) + + no_icon = true endif --
