raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=7660a6aabce4c2b7597a28833629ad6df8491dce
commit 7660a6aabce4c2b7597a28833629ad6df8491dce Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Sat Aug 12 13:32:20 2017 +0900 meson build - simplify and cleanup evrything module all done now! :) --- src/modules/everything/meson.build | 110 +++++++++++++++---------------------- src/modules/meson.build | 7 +-- 2 files changed, 47 insertions(+), 70 deletions(-) diff --git a/src/modules/everything/meson.build b/src/modules/everything/meson.build index 15f8619c2..042129f47 100644 --- a/src/modules/everything/meson.build +++ b/src/modules/everything/meson.build @@ -1,70 +1,48 @@ -everything_dist = [ - 'e-module-everything.edj', - 'e-module-everything-start.edj', - 'module.desktop', -] +src = files( + 'e_mod_main.c', + 'evry.c', + 'evry_config.c', + 'evry_gadget.c', + 'evry_history.c', + 'evry_plug_actions.c', + 'evry_plug_aggregator.c', + 'evry_plug_apps.c', + 'evry_plug_calc.c', + 'evry_plug_clipboard.c', + 'evry_plug_collection.c', + 'evry_plug_files.c', + 'evry_plugin.c', + 'evry_plug_settings.c', + 'evry_plug_text.c', + 'evry_plug_windows.c', + 'evry_util.c', + 'evry_view.c', + 'evry_view_help.c', + 'evry_view_tabs.c', + 'md5.c', + 'e_mod_main.h', + 'evry_api.h', + 'evry_types.h', + 'md5.h' + ) -everything_src = [ - 'e_mod_main.c', - 'evry.c', - 'evry_config.c', - 'evry_gadget.c', - 'evry_history.c', - 'evry_plug_actions.c', - 'evry_plug_aggregator.c', - 'evry_plug_apps.c', - 'evry_plug_calc.c', - 'evry_plug_clipboard.c', - 'evry_plug_collection.c', - 'evry_plug_files.c', - 'evry_plugin.c', - 'evry_plug_settings.c', - 'evry_plug_text.c', - 'evry_plug_windows.c', - 'evry_util.c', - 'evry_view.c', - 'evry_view_help.c', - 'evry_view_tabs.c', - 'md5.c', - 'e_mod_main.h', - 'evry_api.h', - 'evry_types.h', - 'md5.h', -] +data = [ 'e-module-everything-start.edj' ] -everything_dir = join_paths(dir_module_e, 'everything', module_arch) -if get_option('everything') == true - config_h.set('USE_MODULE_EVERYTHING', '1') - - install_data(everything_dist, - install_dir: join_paths(dir_module_e, 'everything') - ) - - module_files += join_paths(everything_dir, 'everything.so') - shared_module('everything', - everything_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: everything_dir, - install: true - ) - - install_headers(['evry_api.h', 'evry_types.h'], - subdir: 'enlightenment' - ) - pkgconfig.generate( - name: 'e17-everything', - description: 'Everything module for Enlightenment', - filebase: 'everything', - subdirs: 'enlightenment', - requires: 'enlightenment', - version: e_version_rev, - install_dir: dir_pkgconfig, - variables: [ - 'exec_prefix=${prefix}', - 'plugindir=${libdir}/enlightenment/modules/everything/plugins' - ] - ) +if get_option(m) == true + install_headers([ 'evry_api.h', 'evry_types.h' ], + subdir: 'enlightenment' + ) + pkgconfig.generate(name: 'e17-everything', + description: 'Everything module for Enlightenment', + filebase : 'everything', + subdirs : 'enlightenment', + requires : 'enlightenment', + version : e_version_rev, + install_dir: dir_pkgconfig, + variables : [ + 'exec_prefix=${prefix}', + 'plugindir=${libdir}/enlightenment/modules/everything/plugins' + ] + ) endif diff --git a/src/modules/meson.build b/src/modules/meson.build index 8642d4206..d44be8749 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -4,8 +4,6 @@ module_includes = [ '../../..', '../../bin', '../../bin/efx' ] module_includes2 = [ '../..' , '../bin' , '../bin/efx' ] module_deps = [ deps_e, dep_dl ] -subdir('everything') - mods = [ # standard run of the mill modules with cion and desktop 'ibar', @@ -14,6 +12,7 @@ mods = [ 'temperature', 'mixer', 'notification', + 'everything', 'ibox', 'start', 'winlist', @@ -63,6 +62,7 @@ mods = [ 'conf_display', 'conf_bindings', # also standard modules with no icon or desktop file + 'xwayland', 'lokker', 'wl_x11', 'wl_wl', @@ -72,8 +72,7 @@ mods = [ 'wl_desktop_shell', 'wl_weekeyboard', ### XXX: disabled for now -# 'wl_fb', - 'xwayland' +# 'wl_fb' ] foreach m: mods --
