From 29901d67b23e5d1c3509d84324de7ca17a96b31c Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Tue, 8 Aug 2017 18:19:11 +0200 Subject: [PATCH] meson: use file instead of doing the relative path by hand a reason for doing that is that you can just pack together targets into a array and pass them to our helper, and the helper will just handle them, so even module with eldbus codegen etc is now supported. This also means that we are just passing the src object directly into the shared_module call, which means the user of our helper can just pack everything he needs into the src var and the helper does not need to know about it. --- src/modules/appmenu/meson.build | 4 ++-- src/modules/backlight/meson.build | 4 ++-- src/modules/bluez4/meson.build | 4 ++-- src/modules/clock/meson.build | 4 ++-- src/modules/conf/meson.build | 4 ++-- src/modules/conf_applications/meson.build | 4 ++-- src/modules/conf_bindings/meson.build | 4 ++-- src/modules/conf_dialogs/meson.build | 4 ++-- src/modules/conf_display/meson.build | 5 ++--- src/modules/conf_interaction/meson.build | 4 ++-- src/modules/conf_intl/meson.build | 4 ++-- src/modules/conf_menus/meson.build | 4 ++-- src/modules/conf_paths/meson.build | 4 ++-- src/modules/conf_performance/meson.build | 4 ++-- src/modules/conf_randr/meson.build | 4 ++-- src/modules/conf_shelves/meson.build | 4 ++-- src/modules/conf_theme/meson.build | 4 ++-- src/modules/conf_window_manipulation/meson.build | 4 ++-- src/modules/conf_window_remembers/meson.build | 4 ++-- src/modules/connman/meson.build | 4 ++-- src/modules/fileman/meson.build | 4 ++-- src/modules/fileman_opinfo/meson.build | 4 ++-- src/modules/gadman/meson.build | 4 ++-- src/modules/ibar/meson.build | 4 ++-- src/modules/ibox/meson.build | 4 ++-- src/modules/lokker/meson.build | 4 ++-- src/modules/luncher/meson.build | 4 ++-- src/modules/meson.build | 9 ++------- src/modules/msgbus/meson.build | 4 ++-- src/modules/notification/meson.build | 4 ++-- src/modules/packagekit/meson.build | 4 ++-- src/modules/pager/meson.build | 4 ++-- src/modules/pager_plain/meson.build | 4 ++-- src/modules/quickaccess/meson.build | 4 ++-- src/modules/shot/meson.build | 4 ++-- src/modules/start/meson.build | 4 ++-- src/modules/syscon/meson.build | 4 ++-- src/modules/systray/meson.build | 4 ++-- src/modules/tasks/meson.build | 4 ++-- src/modules/teamwork/meson.build | 4 ++-- src/modules/temperature/meson.build | 4 ++-- src/modules/tiling/meson.build | 4 ++-- src/modules/time/meson.build | 4 ++-- src/modules/winlist/meson.build | 4 ++-- src/modules/wireless/meson.build | 4 ++-- src/modules/wizard/meson.build | 4 ++-- src/modules/wl_buffer/meson.build | 4 ++-- src/modules/wl_drm/meson.build | 4 ++-- src/modules/wl_wl/meson.build | 4 ++-- src/modules/wl_x11/meson.build | 4 ++-- src/modules/xkbswitch/meson.build | 4 ++-- src/modules/xwayland/meson.build | 4 ++-- 52 files changed, 104 insertions(+), 110 deletions(-) diff --git a/src/modules/appmenu/meson.build b/src/modules/appmenu/meson.build index 3a3813d9b..335a6de45 100644 --- a/src/modules/appmenu/meson.build +++ b/src/modules/appmenu/meson.build @@ -1,6 +1,6 @@ -src = [ +src = files( 'e_mod_main.c', 'e_mod_appmenu_render.c', 'e_mod_dbus_registrar_server.c', 'e_mod_appmenu_private.h' -] + ) diff --git a/src/modules/backlight/meson.build b/src/modules/backlight/meson.build index 9e19e8c7b..c601cd6fc 100644 --- a/src/modules/backlight/meson.build +++ b/src/modules/backlight/meson.build @@ -1,5 +1,5 @@ -src = [ +src = files( 'e_mod_main.c', 'gadget/backlight.c', 'gadget/mod.c' -] +) diff --git a/src/modules/bluez4/meson.build b/src/modules/bluez4/meson.build index 0e0e627f5..05262db4e 100644 --- a/src/modules/bluez4/meson.build +++ b/src/modules/bluez4/meson.build @@ -1,5 +1,5 @@ -src = [ +src = files( 'e_mod_main.c', 'agent.c', 'ebluez4.c' -] +) diff --git a/src/modules/clock/meson.build b/src/modules/clock/meson.build index 9d426f36f..b42668d41 100644 --- a/src/modules/clock/meson.build +++ b/src/modules/clock/meson.build @@ -1,5 +1,5 @@ -src = [ +src = files( 'e_mod_main.c', 'e_mod_config.c', 'e_mod_main.h' -] +) diff --git a/src/modules/conf/meson.build b/src/modules/conf/meson.build index e0f9e752c..c4ad42be5 100644 --- a/src/modules/conf/meson.build +++ b/src/modules/conf/meson.build @@ -1,5 +1,5 @@ -src = [ +src = files( 'e_mod_main.c', 'e_conf.c', 'e_mod_config.c' -] +) diff --git a/src/modules/conf_applications/meson.build b/src/modules/conf_applications/meson.build index 6ee74a1ae..e9adc34c2 100644 --- a/src/modules/conf_applications/meson.build +++ b/src/modules/conf_applications/meson.build @@ -1,8 +1,8 @@ -src = [ +src = files( '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' -] +) diff --git a/src/modules/conf_bindings/meson.build b/src/modules/conf_bindings/meson.build index 81f849964..aec7492fd 100644 --- a/src/modules/conf_bindings/meson.build +++ b/src/modules/conf_bindings/meson.build @@ -1,4 +1,4 @@ -src = [ +src = files( 'e_mod_main.c', 'e_int_config_acpibindings.c', 'e_int_config_edgebindings.c', @@ -6,6 +6,6 @@ src = [ 'e_int_config_mousebindings.c', 'e_int_config_signalbindings.c', 'e_mod_main.h' -] +) desktop_only = true diff --git a/src/modules/conf_dialogs/meson.build b/src/modules/conf_dialogs/meson.build index 79447d269..3325b3e39 100644 --- a/src/modules/conf_dialogs/meson.build +++ b/src/modules/conf_dialogs/meson.build @@ -1,6 +1,6 @@ -src = [ +src = files( 'e_mod_main.c', 'e_int_config_dialogs.c', 'e_int_config_profiles.c', 'e_mod_main.h' -] +) diff --git a/src/modules/conf_display/meson.build b/src/modules/conf_display/meson.build index 4844f3478..55d9db2f6 100644 --- a/src/modules/conf_display/meson.build +++ b/src/modules/conf_display/meson.build @@ -1,5 +1,4 @@ -src = [ - 'e_mod_main.c', +src = files( 'e_int_config_desk.c', 'e_int_config_desklock.c', 'e_int_config_desklock_fsel.c', @@ -7,6 +6,6 @@ src = [ 'e_int_config_dpms.c', 'e_int_config_screensaver.c', 'e_mod_main.h' -] + ) desktop_only = true diff --git a/src/modules/conf_interaction/meson.build b/src/modules/conf_interaction/meson.build index b82698c1d..f1bb9b0f3 100644 --- a/src/modules/conf_interaction/meson.build +++ b/src/modules/conf_interaction/meson.build @@ -1,6 +1,6 @@ -src = [ +src = files( 'e_mod_main.c', 'e_int_config_interaction.c', 'e_int_config_mouse.c', 'e_mod_main.h' -] + ) diff --git a/src/modules/conf_intl/meson.build b/src/modules/conf_intl/meson.build index 2080c6e8e..21c2215ff 100644 --- a/src/modules/conf_intl/meson.build +++ b/src/modules/conf_intl/meson.build @@ -1,9 +1,9 @@ -src = [ +src = files( 'e_mod_main.c', 'e_int_config_imc.c', 'e_int_config_imc_import.c', 'e_int_config_intl.c', 'e_mod_main.h' -] + ) desktop_only = true diff --git a/src/modules/conf_menus/meson.build b/src/modules/conf_menus/meson.build index 18e11cd2f..b7d97b457 100644 --- a/src/modules/conf_menus/meson.build +++ b/src/modules/conf_menus/meson.build @@ -1,5 +1,5 @@ -src = [ +src = files( 'e_mod_main.c', 'e_int_config_menus.c', 'e_mod_main.h' -] + ) diff --git a/src/modules/conf_paths/meson.build b/src/modules/conf_paths/meson.build index 972c94528..e590c8842 100644 --- a/src/modules/conf_paths/meson.build +++ b/src/modules/conf_paths/meson.build @@ -1,6 +1,6 @@ -src = [ +src = files( 'e_mod_main.c', 'e_int_config_env.c', 'e_int_config_paths.c', 'e_mod_main.h' -] + ) diff --git a/src/modules/conf_performance/meson.build b/src/modules/conf_performance/meson.build index e23e1b3bf..835148b79 100644 --- a/src/modules/conf_performance/meson.build +++ b/src/modules/conf_performance/meson.build @@ -1,6 +1,6 @@ -src = [ +src = files( 'e_mod_main.c', 'e_int_config_performance.c', 'e_int_config_powermanagement.c', 'e_mod_main.h' -] + ) diff --git a/src/modules/conf_randr/meson.build b/src/modules/conf_randr/meson.build index 7b20ccd68..065960f72 100644 --- a/src/modules/conf_randr/meson.build +++ b/src/modules/conf_randr/meson.build @@ -1,6 +1,6 @@ -src = [ +src = files( 'e_mod_main.c', 'e_int_config_randr2.c', 'e_int_config_randr2.h', 'e_mod_main.h' -] +) diff --git a/src/modules/conf_shelves/meson.build b/src/modules/conf_shelves/meson.build index 139ca447a..1805431e5 100644 --- a/src/modules/conf_shelves/meson.build +++ b/src/modules/conf_shelves/meson.build @@ -1,6 +1,6 @@ -src = [ +src = files( 'e_mod_main.c', 'e_int_config_shelf.c', 'e_int_config_shelf.h', 'e_mod_main.h' -] + ) diff --git a/src/modules/conf_theme/meson.build b/src/modules/conf_theme/meson.build index 8e036220b..03034f855 100644 --- a/src/modules/conf_theme/meson.build +++ b/src/modules/conf_theme/meson.build @@ -1,4 +1,4 @@ -src = [ +src = files( 'e_mod_main.c', 'e_int_config_borders.c', 'e_int_config_color_classes.c', @@ -10,6 +10,6 @@ src = [ 'e_int_config_wallpaper.c', 'e_int_config_xsettings.c', 'e_mod_main.h' -] + ) desktop_only = true diff --git a/src/modules/conf_window_manipulation/meson.build b/src/modules/conf_window_manipulation/meson.build index 106988368..4bb2fe45c 100644 --- a/src/modules/conf_window_manipulation/meson.build +++ b/src/modules/conf_window_manipulation/meson.build @@ -1,4 +1,4 @@ -src = [ +src = files( 'e_mod_main.c', 'e_int_config_clientlist.c', 'e_int_config_focus.c', @@ -6,4 +6,4 @@ src = [ 'e_int_config_window_geometry.c', 'e_int_config_window_process.c', 'e_mod_main.h' -] + ) diff --git a/src/modules/conf_window_remembers/meson.build b/src/modules/conf_window_remembers/meson.build index e6d350ad6..1dca88fe7 100644 --- a/src/modules/conf_window_remembers/meson.build +++ b/src/modules/conf_window_remembers/meson.build @@ -1,5 +1,5 @@ -src = [ +src = files( 'e_mod_main.c', 'e_int_config_remembers.c', 'e_mod_main.h' -] + ) diff --git a/src/modules/connman/meson.build b/src/modules/connman/meson.build index 5e5182142..72ede3486 100644 --- a/src/modules/connman/meson.build +++ b/src/modules/connman/meson.build @@ -1,8 +1,8 @@ -src = [ +src = files( 'e_mod_main.c', 'agent.c', 'e_connman.c', 'e_mod_config.c', 'E_Connman.h', 'e_mod_main.h' -] +) diff --git a/src/modules/fileman/meson.build b/src/modules/fileman/meson.build index 94c56f97b..594a4fc82 100644 --- a/src/modules/fileman/meson.build +++ b/src/modules/fileman/meson.build @@ -1,4 +1,4 @@ -src = [ +src = files( 'e_mod_main.c', 'e_fwin.c', 'e_fwin_nav.c', @@ -8,4 +8,4 @@ src = [ 'e_mod_dbus.c', 'e_mod_menu.c', 'e_mod_main.h' -] + ) diff --git a/src/modules/fileman_opinfo/meson.build b/src/modules/fileman_opinfo/meson.build index 2aff594c9..42119f40e 100644 --- a/src/modules/fileman_opinfo/meson.build +++ b/src/modules/fileman_opinfo/meson.build @@ -1,3 +1,3 @@ -src = [ +src = files( 'e_mod_main.c' -] + ) diff --git a/src/modules/gadman/meson.build b/src/modules/gadman/meson.build index b2d6a88a3..d44cf98af 100644 --- a/src/modules/gadman/meson.build +++ b/src/modules/gadman/meson.build @@ -1,6 +1,6 @@ -src = [ +src = files( 'e_mod_main.c', 'e_mod_config.c', 'e_mod_gadman.c', 'e_mod_gadman.h' -] + ) diff --git a/src/modules/ibar/meson.build b/src/modules/ibar/meson.build index 9d426f36f..5b450ed2c 100644 --- a/src/modules/ibar/meson.build +++ b/src/modules/ibar/meson.build @@ -1,5 +1,5 @@ -src = [ +src = files( 'e_mod_main.c', 'e_mod_config.c', 'e_mod_main.h' -] + ) diff --git a/src/modules/ibox/meson.build b/src/modules/ibox/meson.build index 9d426f36f..5b450ed2c 100644 --- a/src/modules/ibox/meson.build +++ b/src/modules/ibox/meson.build @@ -1,5 +1,5 @@ -src = [ +src = files( 'e_mod_main.c', 'e_mod_config.c', 'e_mod_main.h' -] + ) diff --git a/src/modules/lokker/meson.build b/src/modules/lokker/meson.build index e543cf675..995cde3a9 100644 --- a/src/modules/lokker/meson.build +++ b/src/modules/lokker/meson.build @@ -1,7 +1,7 @@ -src = [ +src = files( 'e_mod_main.c', 'lokker.c', 'e_mod_main.h' -] + ) no_icon = true diff --git a/src/modules/luncher/meson.build b/src/modules/luncher/meson.build index 0481c44c5..17905a7d7 100644 --- a/src/modules/luncher/meson.build +++ b/src/modules/luncher/meson.build @@ -1,7 +1,7 @@ -src = [ +src = files( 'mod.c', 'bar.c', 'config.c', 'grid.c', 'luncher.h' -] + ) diff --git a/src/modules/meson.build b/src/modules/meson.build index 4d275c430..11d713a77 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -99,14 +99,9 @@ foreach m: mods install_dir: _dir) endif - _src = [ ] - foreach s: src - _src += [ join_paths(m, s) ] - endforeach - config_h.set(_conf, '1') if cargs == '' - shared_module(m, _src, + shared_module(m, src, include_directories: _inc, name_prefix : '', dependencies : module_deps, @@ -114,7 +109,7 @@ foreach m: mods install : true ) else - shared_module(m, _src, + shared_module(m, src, include_directories: _inc, c_args : cargs, name_prefix : '', diff --git a/src/modules/msgbus/meson.build b/src/modules/msgbus/meson.build index 8a2b49429..752f75da3 100644 --- a/src/modules/msgbus/meson.build +++ b/src/modules/msgbus/meson.build @@ -1,4 +1,4 @@ -src = [ +src = files( 'e_mod_main.c', 'msgbus_audit.c', 'msgbus_desktop.c', @@ -7,4 +7,4 @@ src = [ 'msgbus_profile.c', 'msgbus_window.c', 'e_mod_main.h' -] + ) diff --git a/src/modules/notification/meson.build b/src/modules/notification/meson.build index d56581e14..192daf645 100644 --- a/src/modules/notification/meson.build +++ b/src/modules/notification/meson.build @@ -1,6 +1,6 @@ -src = [ +src = files( 'e_mod_main.c', 'e_mod_config.c', 'e_mod_popup.c', 'e_mod_main.h' -] + ) diff --git a/src/modules/packagekit/meson.build b/src/modules/packagekit/meson.build index e9298dc64..2d0f52691 100644 --- a/src/modules/packagekit/meson.build +++ b/src/modules/packagekit/meson.build @@ -1,8 +1,8 @@ -src = [ +src = files( 'e_mod_main.c', 'e_mod_config.c', 'e_mod_packagekit.c', 'e_mod_config.h', 'e_mod_main.h', 'e_mod_packagekit.h' -] + ) diff --git a/src/modules/pager/meson.build b/src/modules/pager/meson.build index 77bc57953..dad8fa4ea 100644 --- a/src/modules/pager/meson.build +++ b/src/modules/pager/meson.build @@ -1,4 +1,4 @@ -src = [ +src = files( 'e_mod_main.c', 'e_mod_config.c', 'e_mod_main.h', @@ -6,4 +6,4 @@ src = [ 'gadget/pager.h', 'gadget/pager.c', 'gadget/config.c' -] +) diff --git a/src/modules/pager_plain/meson.build b/src/modules/pager_plain/meson.build index 9d426f36f..5b450ed2c 100644 --- a/src/modules/pager_plain/meson.build +++ b/src/modules/pager_plain/meson.build @@ -1,5 +1,5 @@ -src = [ +src = files( 'e_mod_main.c', 'e_mod_config.c', 'e_mod_main.h' -] + ) diff --git a/src/modules/quickaccess/meson.build b/src/modules/quickaccess/meson.build index 63425f144..9b2cc82aa 100644 --- a/src/modules/quickaccess/meson.build +++ b/src/modules/quickaccess/meson.build @@ -1,8 +1,8 @@ -src = [ +src = files( 'e_mod_main.c', 'e_mod_config.c', 'e_mod_quickaccess.c', 'e_quickaccess_bindings.c', 'e_quickaccess_db.c', 'e_mod_main.h' -] + ) diff --git a/src/modules/shot/meson.build b/src/modules/shot/meson.build index 2aff594c9..42119f40e 100644 --- a/src/modules/shot/meson.build +++ b/src/modules/shot/meson.build @@ -1,3 +1,3 @@ -src = [ +src = files( 'e_mod_main.c' -] + ) diff --git a/src/modules/start/meson.build b/src/modules/start/meson.build index a1640dc28..8ea716cc3 100644 --- a/src/modules/start/meson.build +++ b/src/modules/start/meson.build @@ -1,4 +1,4 @@ -src = [ +src = files( 'e_mod_main.c', 'start.c' -] + ) diff --git a/src/modules/syscon/meson.build b/src/modules/syscon/meson.build index 9562b9208..580180042 100644 --- a/src/modules/syscon/meson.build +++ b/src/modules/syscon/meson.build @@ -1,7 +1,7 @@ -src = [ +src = files( 'e_mod_main.c', 'e_int_config_syscon.c', 'e_syscon.c', 'e_syscon_gadget.c', 'e_mod_main.h' -] + ) diff --git a/src/modules/systray/meson.build b/src/modules/systray/meson.build index f7dd964bb..00023543b 100644 --- a/src/modules/systray/meson.build +++ b/src/modules/systray/meson.build @@ -1,8 +1,8 @@ -src = [ +src = files( 'e_mod_main.c', 'e_mod_notifier_host.c', 'e_mod_notifier_host_dbus.c', 'e_mod_notifier_watcher.c', 'e_mod_main.h', 'e_mod_notifier_host_private.h' -] + ) diff --git a/src/modules/tasks/meson.build b/src/modules/tasks/meson.build index 9d426f36f..5b450ed2c 100644 --- a/src/modules/tasks/meson.build +++ b/src/modules/tasks/meson.build @@ -1,5 +1,5 @@ -src = [ +src = files( 'e_mod_main.c', 'e_mod_config.c', 'e_mod_main.h' -] + ) diff --git a/src/modules/teamwork/meson.build b/src/modules/teamwork/meson.build index 13fe23134..a673c5d3f 100644 --- a/src/modules/teamwork/meson.build +++ b/src/modules/teamwork/meson.build @@ -2,12 +2,12 @@ module = 'teamwork' opt = 'teamwork' conf = 'USE_MODULE_TEAMWORK' -src = [ +src = files( 'e_mod_main.c', 'e_mod_config.c', 'e_mod_tw.c', 'e_mod_main.h' -] + ) if config_h.has('HAVE_WAYLAND') == true src += [ diff --git a/src/modules/temperature/meson.build b/src/modules/temperature/meson.build index 9c8e45593..ade13081c 100644 --- a/src/modules/temperature/meson.build +++ b/src/modules/temperature/meson.build @@ -1,7 +1,7 @@ -src = [ +src = files( 'e_mod_main.c', 'e_mod_config.c', 'e_mod_tempget.c', 'e_mod_udev.c', 'e_mod_main.h' -] + ) diff --git a/src/modules/tiling/meson.build b/src/modules/tiling/meson.build index 434fff0e5..1f45dba47 100644 --- a/src/modules/tiling/meson.build +++ b/src/modules/tiling/meson.build @@ -1,7 +1,7 @@ -src = [ +src = files( 'e_mod_tiling.c', 'e_mod_config.c', 'window_tree.c', 'e_mod_tiling.h', 'window_tree.h' -] + ) diff --git a/src/modules/time/meson.build b/src/modules/time/meson.build index af938c0f8..43392cbf9 100644 --- a/src/modules/time/meson.build +++ b/src/modules/time/meson.build @@ -1,7 +1,7 @@ -src = [ +src = files( 'mod.c', 'clock.c', 'config.c', 'time.c', 'clock.h' -] + ) diff --git a/src/modules/winlist/meson.build b/src/modules/winlist/meson.build index 7e9ab069f..1c20c7faa 100644 --- a/src/modules/winlist/meson.build +++ b/src/modules/winlist/meson.build @@ -1,7 +1,7 @@ -src = [ +src = files( 'e_mod_main.c', 'e_int_config_winlist.c', 'e_winlist.c', 'e_mod_main.h', 'e_winlist.h' -] + ) diff --git a/src/modules/wireless/meson.build b/src/modules/wireless/meson.build index d9d0aeb87..3799bd50f 100644 --- a/src/modules/wireless/meson.build +++ b/src/modules/wireless/meson.build @@ -1,6 +1,6 @@ -src = [ +src = files( 'mod.c', 'connman.c', 'wireless.c', 'wireless.h' -] + ) diff --git a/src/modules/wizard/meson.build b/src/modules/wizard/meson.build index de0362e7c..fda7db1e7 100644 --- a/src/modules/wizard/meson.build +++ b/src/modules/wizard/meson.build @@ -2,11 +2,11 @@ module = 'wizard' opt = 'wizard' conf = 'USE_MODULE_WIZARD' -src = [ +src = files( 'e_mod_main.c', 'e_wizard.c', 'e_wizard.h' -] + ) pages = [ 'page_000', diff --git a/src/modules/wl_buffer/meson.build b/src/modules/wl_buffer/meson.build index 51e62c24e..7662ca991 100644 --- a/src/modules/wl_buffer/meson.build +++ b/src/modules/wl_buffer/meson.build @@ -1,6 +1,6 @@ -src = [ +src = files( 'e_mod_main.c' -] + ) no_icon = true diff --git a/src/modules/wl_drm/meson.build b/src/modules/wl_drm/meson.build index 51e62c24e..7662ca991 100644 --- a/src/modules/wl_drm/meson.build +++ b/src/modules/wl_drm/meson.build @@ -1,6 +1,6 @@ -src = [ +src = files( 'e_mod_main.c' -] + ) no_icon = true diff --git a/src/modules/wl_wl/meson.build b/src/modules/wl_wl/meson.build index 51e62c24e..7662ca991 100644 --- a/src/modules/wl_wl/meson.build +++ b/src/modules/wl_wl/meson.build @@ -1,6 +1,6 @@ -src = [ +src = files( 'e_mod_main.c' -] + ) no_icon = true diff --git a/src/modules/wl_x11/meson.build b/src/modules/wl_x11/meson.build index 51e62c24e..7662ca991 100644 --- a/src/modules/wl_x11/meson.build +++ b/src/modules/wl_x11/meson.build @@ -1,6 +1,6 @@ -src = [ +src = files( 'e_mod_main.c' -] + ) no_icon = true diff --git a/src/modules/xkbswitch/meson.build b/src/modules/xkbswitch/meson.build index ec1b608a3..374e55c50 100644 --- a/src/modules/xkbswitch/meson.build +++ b/src/modules/xkbswitch/meson.build @@ -1,4 +1,4 @@ -src = [ +src = files( 'e_mod_main.c', 'e_mod_config.c', 'e_mod_parse.c', @@ -7,4 +7,4 @@ src = [ 'gadget/xkbswitch.h', 'gadget/xkbswitch.c', 'gadget/mod.c' -] +) diff --git a/src/modules/xwayland/meson.build b/src/modules/xwayland/meson.build index b2f337f4b..7276a4591 100644 --- a/src/modules/xwayland/meson.build +++ b/src/modules/xwayland/meson.build @@ -1,7 +1,7 @@ -src = [ +src = files( 'e_mod_main.c', 'dnd.c' -] + ) no_icon = true