diff --git a/meson.build b/meson.build index ec146389c..79ab72cfe 100644 --- a/meson.build +++ b/meson.build @@ -404,71 +404,6 @@ module_includes2 = [ '../..', '../bin', '../bin/efx' ] module_deps = [deps_e, dep_dl] subdir('src/modules') -#### the below now use the gneric build above -#subdir('src/modules/ibar') -#subdir('src/modules/clock') -#subdir('src/modules/pager') -#subdir('src/modules/pager_plain') -subdir('src/modules/battery') -subdir('src/modules/temperature') -#subdir('src/modules/notification') -subdir('src/modules/cpufreq') -#subdir('src/modules/ibox') -#subdir('src/modules/start') -#subdir('src/modules/winlist') -#subdir('src/modules/fileman') -#subdir('src/modules/fileman_opinfo') -subdir('src/modules/wizard') -#subdir('src/modules/conf') -subdir('src/modules/conf_theme') -subdir('src/modules/conf_intl') -#subdir('src/modules/msgbus') -#subdir('src/modules/conf_applications') -subdir('src/modules/conf_display') -#subdir('src/modules/conf_shelves') -subdir('src/modules/conf_bindings') -#subdir('src/modules/conf_window_remembers') -subdir('src/modules/conf_window_manipulation') -#subdir('src/modules/conf_menus') -#subdir('src/modules/conf_dialogs') -#subdir('src/modules/conf_performance') -#subdir('src/modules/conf_paths') -#subdir('src/modules/conf_interaction') -#subdir('src/modules/gadman') -subdir('src/modules/mixer') -#subdir('src/modules/connman') -#subdir('src/modules/bluez4') -#subdir('src/modules/syscon') -subdir('src/modules/everything') -#subdir('src/modules/systray') -#subdir('src/modules/appmenu') -#subdir('src/modules/quickaccess') -subdir('src/modules/teamwork') -subdir('src/modules/lokker') -#subdir('src/modules/shot') -#subdir('src/modules/backlight') -#subdir('src/modules/tasks') -#subdir('src/modules/conf_randr') -#subdir('src/modules/xkbswitch') -#subdir('src/modules/tiling') -subdir('src/modules/music-control') -#subdir('src/modules/packagekit') -subdir('src/modules/wl_desktop_shell') -subdir('src/modules/wl_x11') -subdir('src/modules/wl_wl') -subdir('src/modules/wl_buffer') -subdir('src/modules/wl_drm') -subdir('src/modules/wl_text_input') -subdir('src/modules/wl_weekeyboard') -subdir('src/modules/geolocation') -subdir('src/modules/xwayland') -#subdir('src/modules/wireless') -#subdir('src/modules/time') -subdir('src/modules/sysinfo') -#subdir('src/modules/luncher') - -# disabled for ow -####subdir('src/modules/wl_fb') subdir('config') diff --git a/src/modules/conf_bindings/meson.build b/src/modules/conf_bindings/meson.build index c6507f68d..81f849964 100644 --- a/src/modules/conf_bindings/meson.build +++ b/src/modules/conf_bindings/meson.build @@ -1,33 +1,11 @@ -conf_bindings_dist = [ - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_int_config_acpibindings.c', + 'e_int_config_edgebindings.c', + 'e_int_config_keybindings.c', + 'e_int_config_mousebindings.c', + 'e_int_config_signalbindings.c', + 'e_mod_main.h' ] -conf_bindings_src = [ - 'e_int_config_acpibindings.c', - 'e_int_config_edgebindings.c', - 'e_int_config_keybindings.c', - 'e_int_config_mousebindings.c', - 'e_int_config_signalbindings.c', - 'e_mod_main.c', - 'e_mod_main.h', -] - -conf_bindings_dir = join_paths(dir_module_e, 'conf_bindings', module_arch) -if get_option('conf-bindings') == true - config_h.set('USE_MODULE_CONF_BINDINGS', '1') - - install_data(conf_bindings_dist, - install_dir: join_paths(dir_module_e, 'conf_bindings') - ) - - module_files += join_paths(conf_bindings_dir, 'conf_bindings.so') - shared_module('conf_bindings', - conf_bindings_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: conf_bindings_dir, - install: true - ) -endif - +desktop_only = true diff --git a/src/modules/conf_display/meson.build b/src/modules/conf_display/meson.build index d6d3dd47e..4844f3478 100644 --- a/src/modules/conf_display/meson.build +++ b/src/modules/conf_display/meson.build @@ -1,34 +1,12 @@ -conf_display_dist = [ - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_int_config_desk.c', + 'e_int_config_desklock.c', + 'e_int_config_desklock_fsel.c', + 'e_int_config_desks.c', + 'e_int_config_dpms.c', + 'e_int_config_screensaver.c', + 'e_mod_main.h' ] -conf_display_src = [ - 'e_int_config_desk.c', - 'e_int_config_desklock.c', - 'e_int_config_desklock_fsel.c', - 'e_int_config_desks.c', - 'e_int_config_dpms.c', - 'e_int_config_screensaver.c', - 'e_mod_main.c', - 'e_mod_main.h', -] - -conf_display_dir = join_paths(dir_module_e, 'conf_display', module_arch) -if get_option('conf-display') == true - config_h.set('USE_MODULE_CONF_DISPLAY', '1') - - install_data(conf_display_dist, - install_dir: join_paths(dir_module_e, 'conf_display') - ) - - module_files += join_paths(conf_display_dir, 'conf_display.so') - shared_module('conf_display', - conf_display_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: conf_display_dir, - install: true - ) -endif - +desktop_only = true diff --git a/src/modules/conf_intl/meson.build b/src/modules/conf_intl/meson.build index bffa6cbc9..2080c6e8e 100644 --- a/src/modules/conf_intl/meson.build +++ b/src/modules/conf_intl/meson.build @@ -1,31 +1,9 @@ -conf_intl_dist = [ - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_int_config_imc.c', + 'e_int_config_imc_import.c', + 'e_int_config_intl.c', + 'e_mod_main.h' ] -conf_intl_src = [ - 'e_int_config_imc.c', - 'e_int_config_imc_import.c', - 'e_int_config_intl.c', - 'e_mod_main.c', - 'e_mod_main.h', -] - -conf_intl_dir = join_paths(dir_module_e, 'conf_intl', module_arch) -if get_option('conf-intl') == true - config_h.set('USE_MODULE_CONF_INTL', '1') - - install_data(conf_intl_dist, - install_dir: join_paths(dir_module_e, 'conf_intl') - ) - - module_files += join_paths(conf_intl_dir, 'conf_intl.so') - shared_module('conf_intl', - conf_intl_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: conf_intl_dir, - install: true - ) -endif - +desktop_only = true diff --git a/src/modules/conf_theme/meson.build b/src/modules/conf_theme/meson.build index 28ff663c4..8e036220b 100644 --- a/src/modules/conf_theme/meson.build +++ b/src/modules/conf_theme/meson.build @@ -1,37 +1,15 @@ -conf_theme_dist = [ - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_int_config_borders.c', + 'e_int_config_color_classes.c', + 'e_int_config_fonts.c', + 'e_int_config_scale.c', + 'e_int_config_theme.c', + 'e_int_config_theme_import.c', + 'e_int_config_transitions.c', + 'e_int_config_wallpaper.c', + 'e_int_config_xsettings.c', + 'e_mod_main.h' ] -conf_theme_src = [ - 'e_int_config_borders.c', - 'e_int_config_color_classes.c', - 'e_int_config_fonts.c', - 'e_int_config_scale.c', - 'e_int_config_theme.c', - 'e_int_config_theme_import.c', - 'e_int_config_transitions.c', - 'e_int_config_wallpaper.c', - 'e_int_config_xsettings.c', - 'e_mod_main.c', - 'e_mod_main.h', -] - -conf_theme_dir = join_paths(dir_module_e, 'conf_theme', module_arch) -if get_option('conf-theme') == true - config_h.set('USE_MODULE_CONF_THEME', '1') - - install_data(conf_theme_dist, - install_dir: join_paths(dir_module_e, 'conf_theme') - ) - - module_files += join_paths(conf_theme_dir, 'conf_theme.so') - shared_module('conf_theme', - conf_theme_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: conf_theme_dir, - install: true - ) -endif - +desktop_only = true diff --git a/src/modules/conf_window_manipulation/e-module-conf_winmanip.edj b/src/modules/conf_window_manipulation/e-module-conf_window_manipulation.edj similarity index 100% rename from src/modules/conf_window_manipulation/e-module-conf_winmanip.edj rename to src/modules/conf_window_manipulation/e-module-conf_window_manipulation.edj diff --git a/src/modules/conf_window_manipulation/meson.build b/src/modules/conf_window_manipulation/meson.build index e404b3c83..106988368 100644 --- a/src/modules/conf_window_manipulation/meson.build +++ b/src/modules/conf_window_manipulation/meson.build @@ -1,34 +1,9 @@ -conf_window_manipulation_dist = [ - 'e-module-conf_winmanip.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_int_config_clientlist.c', + 'e_int_config_focus.c', + 'e_int_config_window_display.c', + 'e_int_config_window_geometry.c', + 'e_int_config_window_process.c', + 'e_mod_main.h' ] - -conf_window_manipulation_src = [ - 'e_int_config_clientlist.c', - 'e_int_config_focus.c', - 'e_int_config_window_display.c', - 'e_int_config_window_geometry.c', - 'e_int_config_window_process.c', - 'e_mod_main.c', - 'e_mod_main.h', -] - -conf_window_manipulation_dir = join_paths(dir_module_e, 'conf_window_manipulation', module_arch) -if get_option('conf-window-manipulation') == true - config_h.set('USE_MODULE_CONF_WINDOW_MANIPULATION', '1') - - install_data(conf_window_manipulation_dist, - install_dir: join_paths(dir_module_e, 'conf_window_manipulation') - ) - - module_files += join_paths(conf_window_manipulation_dir, 'conf_window_manipulation.so') - shared_module('conf_window_manipulation', - conf_window_manipulation_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: conf_window_manipulation_dir, - install: true - ) -endif - diff --git a/src/modules/conf_window_manipulation/module.desktop b/src/modules/conf_window_manipulation/module.desktop index bd301133d..cdebfaa53 100644 --- a/src/modules/conf_window_manipulation/module.desktop +++ b/src/modules/conf_window_manipulation/module.desktop @@ -34,5 +34,5 @@ Comment[pt]=Configurar políticas de maximização, resistência e aparecimento Comment[ru]=Позволяет настроить политику подъема, сопротивления и увеличения окон. Comment[sr]=Подешава смернице издизања, отпора и увећања прозора. Comment[tr]=Pencere yükseltmesi, direnci ve ekranı kaplama kurallarını yapılandırır. -Icon=e-module-conf_winmanip +Icon=e-module-conf_window_manipulation X-Enlightenment-ModuleType=settings diff --git a/src/modules/lokker/meson.build b/src/modules/lokker/meson.build index c9acbfcc5..e543cf675 100644 --- a/src/modules/lokker/meson.build +++ b/src/modules/lokker/meson.build @@ -1,21 +1,7 @@ -lokker_src = [ - 'e_mod_main.c', - 'lokker.c', - 'e_mod_main.h', +src = [ + 'e_mod_main.c', + 'lokker.c', + 'e_mod_main.h' ] -lokker_dir = join_paths(dir_module_e, 'lokker', module_arch) -if get_option('lokker') == true - config_h.set('USE_MODULE_LOKKER', '1') - - module_files += join_paths(lokker_dir, 'lokker.so') - shared_module('lokker', - lokker_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: lokker_dir, - install: true - ) -endif - +no_icon = true diff --git a/src/modules/meson.build b/src/modules/meson.build index a34271655..4d275c430 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -1,8 +1,26 @@ +subdir('battery') +subdir('cpufreq') +subdir('wizard') +subdir('mixer') +subdir('everything') +subdir('teamwork') +subdir('music-control') +subdir('wl_desktop_shell') +subdir('wl_text_input') +subdir('wl_weekeyboard') +subdir('geolocation') +subdir('sysinfo') + +# disabled for now +####subdir('wl_fb') + mods = [ +# standard run of the mill modules with cion and desktop 'clock', 'ibar', 'pager', 'pager_plain', + 'temperature', 'notification', 'ibox', 'start', @@ -14,6 +32,7 @@ mods = [ 'conf_applications', 'conf_shelves', 'conf_window_remembers', + 'conf_window_manipulation', 'conf_menus', 'conf_dialogs', 'conf_performance', @@ -35,38 +54,74 @@ mods = [ 'packagekit', 'wireless', 'time', - 'luncher' + 'luncher', +# also standard modules, just with only a desktop file using a generic icon + 'conf_theme', + 'conf_intl', + 'conf_display', + 'conf_bindings', +# also standard modules with no icon or desktop file + 'lokker', + 'wl_x11', + 'wl_wl', + 'wl_buffer', + 'wl_drm', + 'xwayland' ] foreach m: mods + desktop_only = false + no_icon = false + disable = false + cargs = '' + subdir(m) opt = '-'.join(m.split('_')) - if get_option(opt) == true - _icon = [ - join_paths(m, 'e-module-' + m + '.edj'), - join_paths(m, 'module.desktop') - ] + if get_option(opt) == true and disable == false + _conf = 'USE_MODULE_' + m.to_upper() _dir = join_paths(dir_module_e, m) _dir_bin = join_paths(_dir, module_arch) _inc = include_directories(module_includes2, join_paths('.', m)) module_files += join_paths(_dir_bin, m + '.so') + if desktop_only == true + install_data([ join_paths(m, 'module.desktop') + ], + install_dir: _dir) + elif no_icon == true + else + install_data([ join_paths(m, 'e-module-' + m + '.edj'), + join_paths(m, 'module.desktop') + ], + install_dir: _dir) + endif + _src = [ ] foreach s: src _src += [ join_paths(m, s) ] endforeach config_h.set(_conf, '1') - install_data(_icon, install_dir: _dir) - shared_module(m, _src, - include_directories: _inc, - name_prefix : '', - dependencies : module_deps, - install_dir : _dir_bin, - install : true - ) + if cargs == '' + shared_module(m, _src, + include_directories: _inc, + name_prefix : '', + dependencies : module_deps, + install_dir : _dir_bin, + install : true + ) + else + shared_module(m, _src, + include_directories: _inc, + c_args : cargs, + name_prefix : '', + dependencies : module_deps, + install_dir : _dir_bin, + install : true + ) + endif endif endforeach diff --git a/src/modules/temperature/meson.build b/src/modules/temperature/meson.build index ae20823f6..9c8e45593 100644 --- a/src/modules/temperature/meson.build +++ b/src/modules/temperature/meson.build @@ -1,7 +1,3 @@ -module = 'temperature' -opt = 'temperature' -conf = 'USE_MODULE_TEMPERATURE' - src = [ 'e_mod_main.c', 'e_mod_config.c', @@ -9,27 +5,3 @@ src = [ 'e_mod_udev.c', 'e_mod_main.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) - - shared_module(module, src, - include_directories: include_directories(module_includes), - name_prefix : '', - dependencies : module_deps, - install_dir : dir_mod_bin, - install : true - ) -endif - diff --git a/src/modules/wl_buffer/meson.build b/src/modules/wl_buffer/meson.build index b301b57eb..51e62c24e 100644 --- a/src/modules/wl_buffer/meson.build +++ b/src/modules/wl_buffer/meson.build @@ -1,19 +1,9 @@ -wl_buffer_src = [ - 'e_mod_main.c', +src = [ + 'e_mod_main.c' ] -wl_buffer_dir = join_paths(dir_module_e, 'wl_buffer', module_arch) -if get_option('wl-buffer') == true and get_option('wayland') == true - config_h.set('USE_MODULE_WL_BUFFER', '1') +no_icon = true - module_files += join_paths(wl_buffer_dir, 'wl_buffer.so') - shared_module('wl_buffer', - wl_buffer_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: wl_buffer_dir, - install: true - ) +if get_option('wayland') != true + disable = true endif - diff --git a/src/modules/wl_drm/meson.build b/src/modules/wl_drm/meson.build index f1db1fec6..51e62c24e 100644 --- a/src/modules/wl_drm/meson.build +++ b/src/modules/wl_drm/meson.build @@ -1,19 +1,9 @@ -wl_drm_src = [ - 'e_mod_main.c', +src = [ + 'e_mod_main.c' ] -wl_drm_dir = join_paths(dir_module_e, 'wl_drm', module_arch) -if get_option('wl-drm') == true and get_option('wayland') == true - config_h.set('USE_MODULE_WL_DRM', '1') +no_icon = true - module_files += join_paths(wl_drm_dir, 'wl_drm.so') - shared_module('wl_drm', - wl_drm_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: wl_drm_dir, - install: true - ) +if get_option('wayland') != true + disable = true endif - diff --git a/src/modules/wl_wl/meson.build b/src/modules/wl_wl/meson.build index e5b2a3a21..51e62c24e 100644 --- a/src/modules/wl_wl/meson.build +++ b/src/modules/wl_wl/meson.build @@ -1,19 +1,9 @@ -wl_wl_src = [ - 'e_mod_main.c', +src = [ + 'e_mod_main.c' ] -wl_wl_dir = join_paths(dir_module_e, 'wl_wl', module_arch) -if get_option('wl-wl') == true and get_option('wayland') == true - config_h.set('USE_MODULE_WL_WL', '1') +no_icon = true - module_files += join_paths(wl_wl_dir, 'wl_wl.so') - shared_module('wl_wl', - wl_wl_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: wl_wl_dir, - install: true - ) +if get_option('wayland') != true + disable = true endif - diff --git a/src/modules/wl_x11/meson.build b/src/modules/wl_x11/meson.build index 812f8880b..51e62c24e 100644 --- a/src/modules/wl_x11/meson.build +++ b/src/modules/wl_x11/meson.build @@ -1,19 +1,9 @@ -wl_x11_src = [ - 'e_mod_main.c', +src = [ + 'e_mod_main.c' ] -wl_x11_dir = join_paths(dir_module_e, 'wl_x11', module_arch) -if get_option('wl-x11') == true and get_option('wayland') == true - config_h.set('USE_MODULE_WL_X11', '1') +no_icon = true - module_files += join_paths(wl_x11_dir, 'wl_x11.so') - shared_module('wl_x11', - wl_x11_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: wl_x11_dir, - install: true - ) +if get_option('wayland') != true + disable = true endif - diff --git a/src/modules/xwayland/meson.build b/src/modules/xwayland/meson.build index 3a2512b48..b2f337f4b 100644 --- a/src/modules/xwayland/meson.build +++ b/src/modules/xwayland/meson.build @@ -1,22 +1,13 @@ -xwayland_src = [ - 'dnd.c', - 'e_mod_main.c', +src = [ + 'e_mod_main.c', + 'dnd.c' ] -xwayland_dir = join_paths(dir_module_e, 'xwayland', module_arch) -if get_option('xwayland') == true and get_option('wayland') == true - config_h.set('USE_MODULE_XWAYLAND', '1') +no_icon = true - xwayland = find_program('Xwayland') - module_files += join_paths(xwayland_dir, 'xwayland.so') - shared_module('xwayland', - xwayland_src, - include_directories: include_directories(module_includes), - c_args: '-DXWAYLAND_BIN="@0@"'.format(xwayland.path()), - name_prefix: '', - dependencies: module_deps, - install_dir: xwayland_dir, - install: true - ) +if get_option('wayland') != true + disable = true +else + xwayland = find_program('Xwayland') + cargs = '-DXWAYLAND_BIN="@0@"'.format(xwayland.path()) endif -