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.
devs/derekf/for_derbyw
Marcel Hollerbach 5 years ago
parent 3becd06c94
commit 29901d67b2
  1. 4
      src/modules/appmenu/meson.build
  2. 4
      src/modules/backlight/meson.build
  3. 4
      src/modules/bluez4/meson.build
  4. 4
      src/modules/clock/meson.build
  5. 4
      src/modules/conf/meson.build
  6. 4
      src/modules/conf_applications/meson.build
  7. 4
      src/modules/conf_bindings/meson.build
  8. 4
      src/modules/conf_dialogs/meson.build
  9. 5
      src/modules/conf_display/meson.build
  10. 4
      src/modules/conf_interaction/meson.build
  11. 4
      src/modules/conf_intl/meson.build
  12. 4
      src/modules/conf_menus/meson.build
  13. 4
      src/modules/conf_paths/meson.build
  14. 4
      src/modules/conf_performance/meson.build
  15. 4
      src/modules/conf_randr/meson.build
  16. 4
      src/modules/conf_shelves/meson.build
  17. 4
      src/modules/conf_theme/meson.build
  18. 4
      src/modules/conf_window_manipulation/meson.build
  19. 4
      src/modules/conf_window_remembers/meson.build
  20. 4
      src/modules/connman/meson.build
  21. 4
      src/modules/fileman/meson.build
  22. 4
      src/modules/fileman_opinfo/meson.build
  23. 4
      src/modules/gadman/meson.build
  24. 4
      src/modules/ibar/meson.build
  25. 4
      src/modules/ibox/meson.build
  26. 4
      src/modules/lokker/meson.build
  27. 4
      src/modules/luncher/meson.build
  28. 9
      src/modules/meson.build
  29. 4
      src/modules/msgbus/meson.build
  30. 4
      src/modules/notification/meson.build
  31. 4
      src/modules/packagekit/meson.build
  32. 4
      src/modules/pager/meson.build
  33. 4
      src/modules/pager_plain/meson.build
  34. 4
      src/modules/quickaccess/meson.build
  35. 4
      src/modules/shot/meson.build
  36. 4
      src/modules/start/meson.build
  37. 4
      src/modules/syscon/meson.build
  38. 4
      src/modules/systray/meson.build
  39. 4
      src/modules/tasks/meson.build
  40. 4
      src/modules/teamwork/meson.build
  41. 4
      src/modules/temperature/meson.build
  42. 4
      src/modules/tiling/meson.build
  43. 4
      src/modules/time/meson.build
  44. 4
      src/modules/winlist/meson.build
  45. 4
      src/modules/wireless/meson.build
  46. 4
      src/modules/wizard/meson.build
  47. 4
      src/modules/wl_buffer/meson.build
  48. 4
      src/modules/wl_drm/meson.build
  49. 4
      src/modules/wl_wl/meson.build
  50. 4
      src/modules/wl_x11/meson.build
  51. 4
      src/modules/xkbswitch/meson.build
  52. 4
      src/modules/xwayland/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'
]
)

@ -1,5 +1,5 @@
src = [
src = files(
'e_mod_main.c',
'gadget/backlight.c',
'gadget/mod.c'
]
)

@ -1,5 +1,5 @@
src = [
src = files(
'e_mod_main.c',
'agent.c',
'ebluez4.c'
]
)

@ -1,5 +1,5 @@
src = [
src = files(
'e_mod_main.c',
'e_mod_config.c',
'e_mod_main.h'
]
)

@ -1,5 +1,5 @@
src = [
src = files(
'e_mod_main.c',
'e_conf.c',
'e_mod_config.c'
]
)

@ -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'
]
)

@ -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

@ -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'
]
)

@ -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

@ -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'
]
)

@ -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

@ -1,5 +1,5 @@
src = [
src = files(
'e_mod_main.c',
'e_int_config_menus.c',
'e_mod_main.h'
]
)

@ -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'
]
)

@ -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'
]
)

@ -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'
]
)

@ -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'
]
)

@ -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

@ -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'
]
)

@ -1,5 +1,5 @@
src = [
src = files(
'e_mod_main.c',
'e_int_config_remembers.c',
'e_mod_main.h'
]
)

@ -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'
]
)

@ -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'
]
)

@ -1,3 +1,3 @@
src = [
src = files(
'e_mod_main.c'
]
)

@ -1,6 +1,6 @@
src = [
src = files(
'e_mod_main.c',
'e_mod_config.c',
'e_mod_gadman.c',
'e_mod_gadman.h'
]
)

@ -1,5 +1,5 @@
src = [
src = files(
'e_mod_main.c',
'e_mod_config.c',
'e_mod_main.h'
]
)

@ -1,5 +1,5 @@
src = [
src = files(
'e_mod_main.c',
'e_mod_config.c',
'e_mod_main.h'
]
)

@ -1,7 +1,7 @@
src = [
src = files(
'e_mod_main.c',
'lokker.c',
'e_mod_main.h'
]
)
no_icon = true

@ -1,7 +1,7 @@
src = [
src = files(
'mod.c',
'bar.c',
'config.c',
'grid.c',
'luncher.h'
]
)

@ -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 : '',

@ -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'
]
)

@ -1,6 +1,6 @@
src = [
src = files(
'e_mod_main.c',
'e_mod_config.c',
'e_mod_popup.c',
'e_mod_main.h'
]
)

@ -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'
]
)

@ -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'
]
)

@ -1,5 +1,5 @@
src = [
src = files(
'e_mod_main.c',
'e_mod_config.c',
'e_mod_main.h'
]
)

@ -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'
]
)

@ -1,3 +1,3 @@
src = [
src = files(
'e_mod_main.c'
]
)

@ -1,4 +1,4 @@
src = [
src = files(
'e_mod_main.c',
'start.c'
]
)

@ -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'
]
)

@ -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'
]
)

@ -1,5 +1,5 @@
src = [
src = files(
'e_mod_main.c',
'e_mod_config.c',
'e_mod_main.h'
]
)

@ -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 += [

@ -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'
]
)

@ -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'
]
)

@ -1,7 +1,7 @@
src = [
src = files(
'mod.c',
'clock.c',
'config.c',
'time.c',
'clock.h'
]
)

@ -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'
]
)

@ -1,6 +1,6 @@
src = [
src = files(
'mod.c',
'connman.c',
'wireless.c',
'wireless.h'
]
)

@ -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',

@ -1,6 +1,6 @@
src = [
src = files(
'e_mod_main.c'
]
)
no_icon = true

@ -1,6 +1,6 @@
src = [
src = files(
'e_mod_main.c'
]
)
no_icon = true

@ -1,6 +1,6 @@
src = [
src = files(
'e_mod_main.c'
]
)
no_icon = true

@ -1,6 +1,6 @@
src = [
src = files(
'e_mod_main.c'
]
)
no_icon = true

@ -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'
]
)

@ -1,7 +1,7 @@
src = [
src = files(
'e_mod_main.c',
'dnd.c'
]
)
no_icon = true

Loading…
Cancel
Save