forked from external/yambar
module/sway-xkb: fix name of .so file, fixes load failures when built as shared module
This commit is contained in:
parent
df2d8fec36
commit
fef40d18e1
2 changed files with 10 additions and 10 deletions
|
@ -9,7 +9,7 @@ mpd = dependency('libmpdclient')
|
||||||
xcb_xkb = dependency('xcb-xkb', required: get_option('backend-x11'))
|
xcb_xkb = dependency('xcb-xkb', required: get_option('backend-x11'))
|
||||||
|
|
||||||
# Module name -> (source-list, dep-list)
|
# Module name -> (source-list, dep-list)
|
||||||
deps = {
|
mod_data = {
|
||||||
'alsa': [[], [m, alsa]],
|
'alsa': [[], [m, alsa]],
|
||||||
'backlight': [[], [m, udev]],
|
'backlight': [[], [m, udev]],
|
||||||
'battery': [[], [udev]],
|
'battery': [[], [udev]],
|
||||||
|
@ -20,11 +20,11 @@ deps = {
|
||||||
'network': [[], []],
|
'network': [[], []],
|
||||||
'removables': [[], [dynlist, udev]],
|
'removables': [[], [dynlist, udev]],
|
||||||
'script': [[], []],
|
'script': [[], []],
|
||||||
'sway_xkb': [['i3-common.c', 'i3-common.h'], [dynlist, json]],
|
'sway-xkb': [['i3-common.c', 'i3-common.h'], [dynlist, json]],
|
||||||
}
|
}
|
||||||
|
|
||||||
if backend_x11
|
if backend_x11
|
||||||
deps += {
|
mod_data += {
|
||||||
'xkb': [[], [xcb_stuff, xcb_xkb]],
|
'xkb': [[], [xcb_stuff, xcb_xkb]],
|
||||||
'xwindow': [[], [xcb_stuff]],
|
'xwindow': [[], [xcb_stuff]],
|
||||||
}
|
}
|
||||||
|
@ -49,25 +49,25 @@ if backend_wayland
|
||||||
command: [wscanner_prog, 'private-code', '@INPUT@', '@OUTPUT@'])
|
command: [wscanner_prog, 'private-code', '@INPUT@', '@OUTPUT@'])
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
deps += {
|
mod_data += {
|
||||||
'river': [[wl_proto_src + wl_proto_headers + river_proto_src + river_proto_headers], []],
|
'river': [[wl_proto_src + wl_proto_headers + river_proto_src + river_proto_headers], [dynlist]],
|
||||||
}
|
}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
foreach mod, data : deps
|
foreach mod, data : mod_data
|
||||||
sources = data[0]
|
sources = data[0]
|
||||||
dep = data[1]
|
deps = data[1]
|
||||||
|
|
||||||
if plugs_as_libs
|
if plugs_as_libs
|
||||||
shared_module(mod, '@0@.c'.format(mod), sources,
|
shared_module(mod, '@0@.c'.format(mod), sources,
|
||||||
dependencies: [module_sdk] + dep,
|
dependencies: [module_sdk] + deps,
|
||||||
name_prefix: 'module_',
|
name_prefix: 'module_',
|
||||||
install: true,
|
install: true,
|
||||||
install_dir: join_paths(get_option('libdir'), 'yambar'))
|
install_dir: join_paths(get_option('libdir'), 'yambar'))
|
||||||
else
|
else
|
||||||
modules += [declare_dependency(
|
modules += [declare_dependency(
|
||||||
sources: ['@0@.c'.format(mod)] + sources,
|
sources: ['@0@.c'.format(mod)] + sources,
|
||||||
dependencies: [module_sdk] + dep,
|
dependencies: [module_sdk] + deps,
|
||||||
compile_args: '-DHAVE_PLUGIN_@0@'.format(mod))]
|
compile_args: '-DHAVE_PLUGIN_@0@'.format(mod.underscorify()))]
|
||||||
endif
|
endif
|
||||||
endforeach
|
endforeach
|
||||||
|
|
Loading…
Add table
Reference in a new issue