From 69290dd7f45eca526fc3be5c55911f482cb9188e Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Fri, 28 Jul 2017 19:41:03 +0900 Subject: [PATCH] e module build - make build files far more generic and far smaller now mdoule build files that fllow one pattern (the most common by far) all JUSt list their souce files and nothing else. this really cuts down on build size/complexity. there are other patterns too (no icons at all) that i'll do next, then we're down into "weird" land where i'll have to think of some more interesting ways to deal with this. --- meson.build | 75 ++++++++++--------- src/modules/appmenu/meson.build | 35 ++------- src/modules/backlight/meson.build | 33 +------- src/modules/bluez4/meson.build | 33 +------- src/modules/conf/meson.build | 33 +------- src/modules/conf_applications/meson.build | 39 ++-------- src/modules/conf_dialogs/meson.build | 35 ++------- src/modules/conf_interaction/meson.build | 35 ++------- src/modules/conf_menus/meson.build | 33 +------- src/modules/conf_paths/meson.build | 35 ++------- src/modules/conf_performance/meson.build | 35 ++------- src/modules/conf_randr/meson.build | 35 ++------- src/modules/conf_shelves/meson.build | 35 ++------- src/modules/conf_window_remembers/meson.build | 33 +------- src/modules/connman/meson.build | 39 ++-------- src/modules/fileman/meson.build | 45 +++-------- src/modules/fileman_opinfo/meson.build | 29 +------ src/modules/gadman/meson.build | 35 ++------- src/modules/ibox/meson.build | 33 +------- src/modules/luncher/meson.build | 28 ------- src/modules/meson.build | 37 ++++++++- src/modules/msgbus/meson.build | 27 ------- src/modules/notification/meson.build | 27 ------- src/modules/packagekit/meson.build | 27 ------- src/modules/pager/meson.build | 27 ------- src/modules/pager_plain/meson.build | 27 ------- src/modules/quickaccess/meson.build | 29 +------ src/modules/shot/meson.build | 27 ------- src/modules/start/meson.build | 27 ------- src/modules/syscon/meson.build | 27 ------- src/modules/systray/meson.build | 27 ------- src/modules/tasks/meson.build | 27 ------- src/modules/tiling/meson.build | 27 ------- src/modules/time/meson.build | 28 ------- src/modules/winlist/meson.build | 28 ------- src/modules/wireless/meson.build | 28 ------- src/modules/xkbswitch/meson.build | 28 ------- 37 files changed, 165 insertions(+), 1043 deletions(-) diff --git a/meson.build b/meson.build index ca398a48a..ec146389c 100644 --- a/meson.build +++ b/meson.build @@ -407,67 +407,68 @@ 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/pager') +#subdir('src/modules/pager_plain') subdir('src/modules/battery') subdir('src/modules/temperature') -subdir('src/modules/notification') +#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/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') subdir('src/modules/conf_theme') subdir('src/modules/conf_intl') -subdir('src/modules/msgbus') -subdir('src/modules/conf_applications') +#subdir('src/modules/msgbus') +#subdir('src/modules/conf_applications') subdir('src/modules/conf_display') -subdir('src/modules/conf_shelves') +#subdir('src/modules/conf_shelves') subdir('src/modules/conf_bindings') -subdir('src/modules/conf_window_remembers') +#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/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/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/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/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/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_fb') 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/wireless') +#subdir('src/modules/time') subdir('src/modules/sysinfo') -subdir('src/modules/luncher') +#subdir('src/modules/luncher') + +# disabled for ow +####subdir('src/modules/wl_fb') subdir('config') diff --git a/src/modules/appmenu/meson.build b/src/modules/appmenu/meson.build index c2f241fe9..3a3813d9b 100644 --- a/src/modules/appmenu/meson.build +++ b/src/modules/appmenu/meson.build @@ -1,31 +1,6 @@ -appmenu_dist = [ - 'e-module-appmenu.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_mod_appmenu_render.c', + 'e_mod_dbus_registrar_server.c', + 'e_mod_appmenu_private.h' ] - -appmenu_src = [ - 'e_mod_main.c', - 'e_mod_appmenu_render.c', - 'e_mod_dbus_registrar_server.c', - 'e_mod_appmenu_private.h' -] - -appmenu_dir = join_paths(dir_module_e, 'appmenu', module_arch) -if get_option('appmenu') == true - config_h.set('USE_MODULE_APPMENU', '1') - - install_data(appmenu_dist, - install_dir: join_paths(dir_module_e, 'appmenu') - ) - - module_files += join_paths(appmenu_dir, 'appmenu.so') - shared_module('appmenu', - appmenu_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: appmenu_dir, - install: true - ) -endif - diff --git a/src/modules/backlight/meson.build b/src/modules/backlight/meson.build index 939090420..9e19e8c7b 100644 --- a/src/modules/backlight/meson.build +++ b/src/modules/backlight/meson.build @@ -1,30 +1,5 @@ -backlight_dist = [ - 'e-module-backlight.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'gadget/backlight.c', + 'gadget/mod.c' ] - -backlight_src = [ - 'e_mod_main.c', - 'gadget/backlight.c', - 'gadget/mod.c' -] - -backlight_dir = join_paths(dir_module_e, 'backlight', module_arch) -if get_option('backlight') == true - config_h.set('USE_MODULE_BACKLIGHT', '1') - - install_data(backlight_dist, - install_dir: join_paths(dir_module_e, 'backlight') - ) - - module_files += join_paths(backlight_dir, 'backlight.so') - shared_module('backlight', - backlight_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: backlight_dir, - install: true - ) -endif - diff --git a/src/modules/bluez4/meson.build b/src/modules/bluez4/meson.build index 7c6e107ea..0e0e627f5 100644 --- a/src/modules/bluez4/meson.build +++ b/src/modules/bluez4/meson.build @@ -1,30 +1,5 @@ -bluez4_dist = [ - 'e-module-bluez4.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'agent.c', + 'ebluez4.c' ] - -bluez4_src = [ - 'agent.c', - 'ebluez4.c', - 'e_mod_main.c' -] - -bluez4_dir = join_paths(dir_module_e, 'bluez4', module_arch) -if get_option('bluez4') == true - config_h.set('USE_MODULE_BLUEZ4', '1') - - install_data(bluez4_dist, - install_dir: join_paths(dir_module_e, 'bluez4') - ) - - module_files += join_paths(bluez4_dir, 'bluez4.so') - shared_module('bluez4', - bluez4_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: bluez4_dir, - install: true - ) -endif - diff --git a/src/modules/conf/meson.build b/src/modules/conf/meson.build index 75e02d4d9..e0f9e752c 100644 --- a/src/modules/conf/meson.build +++ b/src/modules/conf/meson.build @@ -1,30 +1,5 @@ -conf_dist = [ - 'e-module-conf.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_conf.c', + 'e_mod_config.c' ] - -conf_src = [ - 'e_conf.c', - 'e_mod_config.c', - 'e_mod_main.c' -] - -conf_dir = join_paths(dir_module_e, 'conf', module_arch) -if get_option('conf') == true - config_h.set('USE_MODULE_CONF', '1') - - install_data(conf_dist, - install_dir: join_paths(dir_module_e, 'conf') - ) - - module_files += join_paths(conf_dir, 'conf.so') - shared_module('conf', - conf_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: conf_dir, - install: true - ) -endif - diff --git a/src/modules/conf_applications/meson.build b/src/modules/conf_applications/meson.build index 3975a9397..6ee74a1ae 100644 --- a/src/modules/conf_applications/meson.build +++ b/src/modules/conf_applications/meson.build @@ -1,33 +1,8 @@ -conf_applications_dist = [ - 'e-module-conf_applications.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_int_config_apps.c', + 'e_int_config_apps_personal.c', + 'e_int_config_defapps.c', + 'e_int_config_deskenv.c', + 'e_mod_main.h' ] - -conf_applications_src = [ - 'e_int_config_apps.c', - 'e_int_config_apps_personal.c', - 'e_int_config_defapps.c', - 'e_int_config_deskenv.c', - 'e_mod_main.c', - 'e_mod_main.h', -] - -conf_applications_dir = join_paths(dir_module_e, 'conf_applications', module_arch) -if get_option('conf-applications') == true - config_h.set('USE_MODULE_CONF_APPLICATIONS', '1') - - install_data(conf_applications_dist, - install_dir: join_paths(dir_module_e, 'conf_applications') - ) - - module_files += join_paths(conf_applications_dir, 'conf_applications.so') - shared_module('conf_applications', - conf_applications_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: conf_applications_dir, - install: true - ) -endif - diff --git a/src/modules/conf_dialogs/meson.build b/src/modules/conf_dialogs/meson.build index 6ef8e8c3b..79447d269 100644 --- a/src/modules/conf_dialogs/meson.build +++ b/src/modules/conf_dialogs/meson.build @@ -1,31 +1,6 @@ -conf_dialogs_dist = [ - 'e-module-conf_dialogs.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_int_config_dialogs.c', + 'e_int_config_profiles.c', + 'e_mod_main.h' ] - -conf_dialogs_src = [ - 'e_int_config_dialogs.c', - 'e_int_config_profiles.c', - 'e_mod_main.c', - 'e_mod_main.h', -] - -conf_dialogs_dir = join_paths(dir_module_e, 'conf_dialogs', module_arch) -if get_option('conf-dialogs') == true - config_h.set('USE_MODULE_CONF_DIALOGS', '1') - - install_data(conf_dialogs_dist, - install_dir: join_paths(dir_module_e, 'conf_dialogs') - ) - - module_files += join_paths(conf_dialogs_dir, 'conf_dialogs.so') - shared_module('conf_dialogs', - conf_dialogs_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: conf_dialogs_dir, - install: true - ) -endif - diff --git a/src/modules/conf_interaction/meson.build b/src/modules/conf_interaction/meson.build index f33026f35..b82698c1d 100644 --- a/src/modules/conf_interaction/meson.build +++ b/src/modules/conf_interaction/meson.build @@ -1,31 +1,6 @@ -conf_interaction_dist = [ - 'e-module-conf_interaction.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_int_config_interaction.c', + 'e_int_config_mouse.c', + 'e_mod_main.h' ] - -conf_interaction_src = [ - 'e_int_config_interaction.c', - 'e_int_config_mouse.c', - 'e_mod_main.c', - 'e_mod_main.h', -] - -conf_interaction_dir = join_paths(dir_module_e, 'conf_interaction', module_arch) -if get_option('conf-interaction') == true - config_h.set('USE_MODULE_CONF_INTERACTION', '1') - - install_data(conf_interaction_dist, - install_dir: join_paths(dir_module_e, 'conf_interaction') - ) - - module_files += join_paths(conf_interaction_dir, 'conf_interaction.so') - shared_module('conf_interaction', - conf_interaction_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: conf_interaction_dir, - install: true - ) -endif - diff --git a/src/modules/conf_menus/meson.build b/src/modules/conf_menus/meson.build index d699b8a30..18e11cd2f 100644 --- a/src/modules/conf_menus/meson.build +++ b/src/modules/conf_menus/meson.build @@ -1,30 +1,5 @@ -conf_menus_dist = [ - 'e-module-conf_menus.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_int_config_menus.c', + 'e_mod_main.h' ] - -conf_menus_src = [ - 'e_int_config_menus.c', - 'e_mod_main.c', - 'e_mod_main.h', -] - -conf_menus_dir = join_paths(dir_module_e, 'conf_menus', module_arch) -if get_option('conf-menus') == true - config_h.set('USE_MODULE_CONF_MENUS', '1') - - install_data(conf_menus_dist, - install_dir: join_paths(dir_module_e, 'conf_menus') - ) - - module_files += join_paths(conf_menus_dir, 'conf_menus.so') - shared_module('conf_menus', - conf_menus_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: conf_menus_dir, - install: true - ) -endif - diff --git a/src/modules/conf_paths/meson.build b/src/modules/conf_paths/meson.build index 0e62e776b..972c94528 100644 --- a/src/modules/conf_paths/meson.build +++ b/src/modules/conf_paths/meson.build @@ -1,31 +1,6 @@ -conf_paths_dist = [ - 'e-module-conf_paths.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_int_config_env.c', + 'e_int_config_paths.c', + 'e_mod_main.h' ] - -conf_paths_src = [ - 'e_int_config_env.c', - 'e_int_config_paths.c', - 'e_mod_main.c', - 'e_mod_main.h', -] - -conf_paths_dir = join_paths(dir_module_e, 'conf_paths', module_arch) -if get_option('conf-paths') == true - config_h.set('USE_MODULE_CONF_PATHS', '1') - - install_data(conf_paths_dist, - install_dir: join_paths(dir_module_e, 'conf_paths') - ) - - module_files += join_paths(conf_paths_dir, 'conf_paths.so') - shared_module('conf_paths', - conf_paths_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: conf_paths_dir, - install: true - ) -endif - diff --git a/src/modules/conf_performance/meson.build b/src/modules/conf_performance/meson.build index 85c122c3f..e23e1b3bf 100644 --- a/src/modules/conf_performance/meson.build +++ b/src/modules/conf_performance/meson.build @@ -1,31 +1,6 @@ -conf_performance_dist = [ - 'e-module-conf_performance.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_int_config_performance.c', + 'e_int_config_powermanagement.c', + 'e_mod_main.h' ] - -conf_performance_src = [ - 'e_int_config_performance.c', - 'e_int_config_powermanagement.c', - 'e_mod_main.c', - 'e_mod_main.h', -] - -conf_performance_dir = join_paths(dir_module_e, 'conf_performance', module_arch) -if get_option('conf-performance') == true - config_h.set('USE_MODULE_CONF_PERFORMANCE', '1') - - install_data(conf_performance_dist, - install_dir: join_paths(dir_module_e, 'conf_performance') - ) - - module_files += join_paths(conf_performance_dir, 'conf_performance.so') - shared_module('conf_performance', - conf_performance_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: conf_performance_dir, - install: true - ) -endif - diff --git a/src/modules/conf_randr/meson.build b/src/modules/conf_randr/meson.build index 2ce882dba..7b20ccd68 100644 --- a/src/modules/conf_randr/meson.build +++ b/src/modules/conf_randr/meson.build @@ -1,31 +1,6 @@ -conf_randr_dist = [ - 'e-module-conf_randr.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_int_config_randr2.c', + 'e_int_config_randr2.h', + 'e_mod_main.h' ] - -conf_randr_src = [ - 'e_int_config_randr2.c', - 'e_mod_main.c', - 'e_int_config_randr2.h', - 'e_mod_main.h', -] - -conf_randr_dir = join_paths(dir_module_e, 'conf_randr', module_arch) -if get_option('conf-randr') == true - config_h.set('USE_MODULE_CONF_RANDR', '1') - - install_data(conf_randr_dist, - install_dir: join_paths(dir_module_e, 'conf_randr') - ) - - module_files += join_paths(conf_randr_dir, 'conf_randr.so') - shared_module('conf_randr', - conf_randr_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: conf_randr_dir, - install: true - ) -endif - diff --git a/src/modules/conf_shelves/meson.build b/src/modules/conf_shelves/meson.build index 387aeec86..139ca447a 100644 --- a/src/modules/conf_shelves/meson.build +++ b/src/modules/conf_shelves/meson.build @@ -1,31 +1,6 @@ -conf_shelves_dist = [ - 'e-module-conf_shelves.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_int_config_shelf.c', + 'e_int_config_shelf.h', + 'e_mod_main.h' ] - -conf_shelves_src = [ - 'e_int_config_shelf.c', - 'e_mod_main.c', - 'e_int_config_shelf.h', - 'e_mod_main.h', -] - -conf_shelves_dir = join_paths(dir_module_e, 'conf_shelves', module_arch) -if get_option('conf-shelves') == true - config_h.set('USE_MODULE_CONF_SHELVES', '1') - - install_data(conf_shelves_dist, - install_dir: join_paths(dir_module_e, 'conf_shelves') - ) - - module_files += join_paths(conf_shelves_dir, 'conf_shelves.so') - shared_module('conf_shelves', - conf_shelves_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: conf_shelves_dir, - install: true - ) -endif - diff --git a/src/modules/conf_window_remembers/meson.build b/src/modules/conf_window_remembers/meson.build index ed4f1bc8d..e6d350ad6 100644 --- a/src/modules/conf_window_remembers/meson.build +++ b/src/modules/conf_window_remembers/meson.build @@ -1,30 +1,5 @@ -conf_window_remembers_dist = [ - 'e-module-conf_window_remembers.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_int_config_remembers.c', + 'e_mod_main.h' ] - -conf_window_remembers_src = [ - 'e_int_config_remembers.c', - 'e_mod_main.c', - 'e_mod_main.h', -] - -conf_window_remembers_dir = join_paths(dir_module_e, 'conf_window_remembers', module_arch) -if get_option('conf-window-remembers') == true - config_h.set('USE_MODULE_CONF_WINDOW_REMEMBERS', '1') - - install_data(conf_window_remembers_dist, - install_dir: join_paths(dir_module_e, 'conf_window_remembers') - ) - - module_files += join_paths(conf_window_remembers_dir, 'conf_window_remembers.so') - shared_module('conf_window_remembers', - conf_window_remembers_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: conf_window_remembers_dir, - install: true - ) -endif - diff --git a/src/modules/connman/meson.build b/src/modules/connman/meson.build index 7d1327a88..5e5182142 100644 --- a/src/modules/connman/meson.build +++ b/src/modules/connman/meson.build @@ -1,33 +1,8 @@ -connman_dist = [ - 'e-module-connman.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'agent.c', + 'e_connman.c', + 'e_mod_config.c', + 'E_Connman.h', + 'e_mod_main.h' ] - -connman_src = [ - 'agent.c', - 'e_connman.c', - 'e_mod_config.c', - 'e_mod_main.c', - 'E_Connman.h', - 'e_mod_main.h', -] - -connman_dir = join_paths(dir_module_e, 'connman', module_arch) -if get_option('connman') == true - config_h.set('USE_MODULE_CONNMAN', '1') - - install_data(connman_dist, - install_dir: join_paths(dir_module_e, 'connman') - ) - - module_files += join_paths(connman_dir, 'connman.so') - shared_module('connman', - connman_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: connman_dir, - install: true - ) -endif - diff --git a/src/modules/fileman/meson.build b/src/modules/fileman/meson.build index 629d9527f..94c56f97b 100644 --- a/src/modules/fileman/meson.build +++ b/src/modules/fileman/meson.build @@ -1,36 +1,11 @@ -fileman_dist = [ - 'e-module-fileman.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_fwin.c', + 'e_fwin_nav.c', + 'e_int_config_mime.c', + 'e_int_config_mime_edit.c', + 'e_mod_config.c', + 'e_mod_dbus.c', + 'e_mod_menu.c', + 'e_mod_main.h' ] - -fileman_src = [ - 'e_fwin.c', - 'e_fwin_nav.c', - 'e_int_config_mime.c', - 'e_int_config_mime_edit.c', - 'e_mod_config.c', - 'e_mod_dbus.c', - 'e_mod_main.c', - 'e_mod_menu.c', - 'e_mod_main.h', -] - -fileman_dir = join_paths(dir_module_e, 'fileman', module_arch) -if get_option('fileman') == true - config_h.set('USE_MODULE_FILEMAN', '1') - - install_data(fileman_dist, - install_dir: join_paths(dir_module_e, 'fileman') - ) - - module_files += join_paths(fileman_dir, 'fileman.so') - shared_module('fileman', - fileman_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: fileman_dir, - install: true - ) -endif - diff --git a/src/modules/fileman_opinfo/meson.build b/src/modules/fileman_opinfo/meson.build index b726b4f14..2aff594c9 100644 --- a/src/modules/fileman_opinfo/meson.build +++ b/src/modules/fileman_opinfo/meson.build @@ -1,28 +1,3 @@ -fileman_opinfo_dist = [ - 'e-module-fileman_opinfo.edj', - 'module.desktop', +src = [ + 'e_mod_main.c' ] - -fileman_opinfo_src = [ - 'e_mod_main.c', -] - -fileman_opinfo_dir = join_paths(dir_module_e, 'fileman_opinfo', module_arch) -if get_option('fileman-opinfo') == true - config_h.set('USE_MODULE_FILEMAN_OPINFO', '1') - - install_data(fileman_opinfo_dist, - install_dir: join_paths(dir_module_e, 'fileman_opinfo') - ) - - module_files += join_paths(fileman_opinfo_dir, 'fileman_opinfo.so') - shared_module('fileman_opinfo', - fileman_opinfo_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: fileman_opinfo_dir, - install: true - ) -endif - diff --git a/src/modules/gadman/meson.build b/src/modules/gadman/meson.build index d6e4d61da..b2d6a88a3 100644 --- a/src/modules/gadman/meson.build +++ b/src/modules/gadman/meson.build @@ -1,31 +1,6 @@ -gadman_dist = [ - 'e-module-gadman.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_mod_config.c', + 'e_mod_gadman.c', + 'e_mod_gadman.h' ] - -gadman_src = [ - 'e_mod_config.c', - 'e_mod_gadman.c', - 'e_mod_main.c', - 'e_mod_gadman.h', -] - -gadman_dir = join_paths(dir_module_e, 'gadman', module_arch) -if get_option('gadman') == true - config_h.set('USE_MODULE_GADMAN', '1') - - install_data(gadman_dist, - install_dir: join_paths(dir_module_e, 'gadman') - ) - - module_files += join_paths(gadman_dir, 'gadman.so') - shared_module('gadman', - gadman_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: gadman_dir, - install: true - ) -endif - diff --git a/src/modules/ibox/meson.build b/src/modules/ibox/meson.build index 0a9c40468..9d426f36f 100644 --- a/src/modules/ibox/meson.build +++ b/src/modules/ibox/meson.build @@ -1,30 +1,5 @@ -ibox_dist = [ - 'e-module-ibox.edj', - 'module.desktop', +src = [ + 'e_mod_main.c', + 'e_mod_config.c', + 'e_mod_main.h' ] - -ibox_src = [ - 'e_mod_config.c', - 'e_mod_main.c', - 'e_mod_main.h', -] - -ibox_dir = join_paths(dir_module_e, 'ibox', module_arch) -if get_option('ibox') == true - config_h.set('USE_MODULE_IBOX', '1') - - install_data(ibox_dist, - install_dir: join_paths(dir_module_e, 'ibox') - ) - - module_files += join_paths(ibox_dir, 'ibox.so') - shared_module('ibox', - ibox_src, - include_directories: include_directories(module_includes), - name_prefix: '', - dependencies: module_deps, - install_dir: ibox_dir, - install: true - ) -endif - diff --git a/src/modules/luncher/meson.build b/src/modules/luncher/meson.build index 8f6dd5ad2..0481c44c5 100644 --- a/src/modules/luncher/meson.build +++ b/src/modules/luncher/meson.build @@ -1,7 +1,3 @@ -module = 'luncher' -opt = 'luncher' -conf = 'USE_MODULE_LUNCHER' - src = [ 'mod.c', 'bar.c', @@ -9,27 +5,3 @@ src = [ 'grid.c', 'luncher.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/meson.build b/src/modules/meson.build index 3ce603db0..a34271655 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -1,6 +1,41 @@ mods = [ 'clock', - 'ibar' + 'ibar', + 'pager', + 'pager_plain', + 'notification', + 'ibox', + 'start', + 'winlist', + 'fileman', + 'fileman_opinfo', + 'conf', + 'msgbus', + 'conf_applications', + 'conf_shelves', + 'conf_window_remembers', + 'conf_menus', + 'conf_dialogs', + 'conf_performance', + 'conf_paths', + 'conf_interaction', + 'gadman', + 'connman', + 'bluez4', + 'syscon', + 'systray', + 'appmenu', + 'quickaccess', + 'shot', + 'backlight', + 'tasks', + 'conf_randr', + 'xkbswitch', + 'tiling', + 'packagekit', + 'wireless', + 'time', + 'luncher' ] foreach m: mods diff --git a/src/modules/msgbus/meson.build b/src/modules/msgbus/meson.build index 495c81328..8a2b49429 100644 --- a/src/modules/msgbus/meson.build +++ b/src/modules/msgbus/meson.build @@ -1,7 +1,3 @@ -module = 'msgbus' -opt = 'msgbus' -conf = 'USE_MODULE_MSGBUS' - src = [ 'e_mod_main.c', 'msgbus_audit.c', @@ -12,26 +8,3 @@ src = [ 'msgbus_window.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/notification/meson.build b/src/modules/notification/meson.build index 4167c6223..d56581e14 100644 --- a/src/modules/notification/meson.build +++ b/src/modules/notification/meson.build @@ -1,33 +1,6 @@ -module = 'notification' -opt = 'notification' -conf = 'USE_MODULE_NOTIFICATION' - src = [ 'e_mod_main.c', 'e_mod_config.c', 'e_mod_popup.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/packagekit/meson.build b/src/modules/packagekit/meson.build index a1de1ff90..e9298dc64 100644 --- a/src/modules/packagekit/meson.build +++ b/src/modules/packagekit/meson.build @@ -1,7 +1,3 @@ -module = 'packagekit' -opt = 'packagekit' -conf = 'USE_MODULE_PACKAGEKIT' - src = [ 'e_mod_main.c', 'e_mod_config.c', @@ -10,26 +6,3 @@ src = [ 'e_mod_main.h', 'e_mod_packagekit.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/pager/meson.build b/src/modules/pager/meson.build index 47e0b1ef5..77bc57953 100644 --- a/src/modules/pager/meson.build +++ b/src/modules/pager/meson.build @@ -1,7 +1,3 @@ -module = 'pager' -opt = 'pager' -conf = 'USE_MODULE_PAGER' - src = [ 'e_mod_main.c', 'e_mod_config.c', @@ -11,26 +7,3 @@ src = [ 'gadget/pager.c', 'gadget/config.c' ] - -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/pager_plain/meson.build b/src/modules/pager_plain/meson.build index 78a14f960..9d426f36f 100644 --- a/src/modules/pager_plain/meson.build +++ b/src/modules/pager_plain/meson.build @@ -1,32 +1,5 @@ -module = 'pager_plain' -opt = 'pager-plain' -conf = 'USE_MODULE_PAGER_PLAIN' - src = [ 'e_mod_main.c', 'e_mod_config.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/quickaccess/meson.build b/src/modules/quickaccess/meson.build index 909bf170e..63425f144 100644 --- a/src/modules/quickaccess/meson.build +++ b/src/modules/quickaccess/meson.build @@ -1,35 +1,8 @@ -module = 'quickaccess' -opt = 'quickaccess' -conf = 'USE_MODULE_QUICKACCESS' - src = [ 'e_mod_main.c', 'e_mod_config.c', 'e_mod_quickaccess.c', 'e_quickaccess_bindings.c', 'e_quickaccess_db.c', - 'e_mod_main.h', + '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/shot/meson.build b/src/modules/shot/meson.build index b480ef2be..2aff594c9 100644 --- a/src/modules/shot/meson.build +++ b/src/modules/shot/meson.build @@ -1,30 +1,3 @@ -module = 'shot' -opt = 'shot' -conf = 'USE_MODULE_SHOT' - src = [ 'e_mod_main.c' ] - -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/start/meson.build b/src/modules/start/meson.build index 7e5b583b1..a1640dc28 100644 --- a/src/modules/start/meson.build +++ b/src/modules/start/meson.build @@ -1,31 +1,4 @@ -module = 'start' -opt = 'start' -conf = 'USE_MODULE_START' - src = [ 'e_mod_main.c', 'start.c' ] - -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/syscon/meson.build b/src/modules/syscon/meson.build index ffdfda747..9562b9208 100644 --- a/src/modules/syscon/meson.build +++ b/src/modules/syscon/meson.build @@ -1,7 +1,3 @@ -module = 'syscon' -opt = 'syscon' -conf = 'USE_MODULE_SYSCON' - src = [ 'e_mod_main.c', 'e_int_config_syscon.c', @@ -9,26 +5,3 @@ src = [ 'e_syscon_gadget.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/systray/meson.build b/src/modules/systray/meson.build index 398659491..f7dd964bb 100644 --- a/src/modules/systray/meson.build +++ b/src/modules/systray/meson.build @@ -1,7 +1,3 @@ -module = 'systray' -opt = 'systray' -conf = 'USE_MODULE_SYSTRAY' - src = [ 'e_mod_main.c', 'e_mod_notifier_host.c', @@ -10,26 +6,3 @@ src = [ 'e_mod_main.h', 'e_mod_notifier_host_private.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/tasks/meson.build b/src/modules/tasks/meson.build index 17c22c566..9d426f36f 100644 --- a/src/modules/tasks/meson.build +++ b/src/modules/tasks/meson.build @@ -1,32 +1,5 @@ -module = 'tasks' -opt = 'tasks' -conf = 'USE_MODULE_TASKS' - src = [ 'e_mod_main.c', 'e_mod_config.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/tiling/meson.build b/src/modules/tiling/meson.build index 0bc92b907..434fff0e5 100644 --- a/src/modules/tiling/meson.build +++ b/src/modules/tiling/meson.build @@ -1,7 +1,3 @@ -module = 'tiling' -opt = 'tiling' -conf = 'USE_MODULE_TILING' - src = [ 'e_mod_tiling.c', 'e_mod_config.c', @@ -9,26 +5,3 @@ src = [ 'e_mod_tiling.h', 'window_tree.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/time/meson.build b/src/modules/time/meson.build index 8b1102b5c..af938c0f8 100644 --- a/src/modules/time/meson.build +++ b/src/modules/time/meson.build @@ -1,7 +1,3 @@ -module = 'time' -opt = 'time' -conf = 'USE_MODULE_TIME' - src = [ 'mod.c', 'clock.c', @@ -9,27 +5,3 @@ src = [ 'time.c', 'clock.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/winlist/meson.build b/src/modules/winlist/meson.build index b0da637c1..7e9ab069f 100644 --- a/src/modules/winlist/meson.build +++ b/src/modules/winlist/meson.build @@ -1,7 +1,3 @@ -module = 'winlist' -opt = 'winlist' -conf = 'USE_MODULE_WINLIST' - src = [ 'e_mod_main.c', 'e_int_config_winlist.c', @@ -9,27 +5,3 @@ src = [ 'e_mod_main.h', 'e_winlist.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/wireless/meson.build b/src/modules/wireless/meson.build index 32ab46c50..d9d0aeb87 100644 --- a/src/modules/wireless/meson.build +++ b/src/modules/wireless/meson.build @@ -1,34 +1,6 @@ -module = 'wireless' -opt = 'wireless' -conf = 'USE_MODULE_WIRELESS' - src = [ 'mod.c', 'connman.c', 'wireless.c', 'wireless.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/xkbswitch/meson.build b/src/modules/xkbswitch/meson.build index 17994974e..ec1b608a3 100644 --- a/src/modules/xkbswitch/meson.build +++ b/src/modules/xkbswitch/meson.build @@ -1,7 +1,3 @@ -module = 'xkbswitch' -opt = 'xkbswitch' -conf = 'USE_MODULE_XKBSWITCH' - src = [ 'e_mod_main.c', 'e_mod_config.c', @@ -12,27 +8,3 @@ src = [ 'gadget/xkbswitch.c', 'gadget/mod.c' ] - -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 -