mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-10 12:33:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: drop intermediate libraries for protocols

Browse Source 
(cherry picked from commit af8a5a8918)
This commit is contained in:
Simon Ser 2022-11-25 10:51:20 +01:00
parent 2a6bcc6738
commit 52166bc1f5
4 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
protocols/meson.build
View File

@ -19,7 +19,6 @@ protocols = [
] ]
wl_protos_src = [] wl_protos_src = []
wl_protos_headers = []
foreach xml : protocols foreach xml : protocols
wl_protos_src += custom_target( wl_protos_src += custom_target(
@ -28,38 +27,16 @@ foreach xml : protocols
output: '@BASENAME@-protocol.c', output: '@BASENAME@-protocol.c',
command: [wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'], command: [wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'],
) )
wl_protos_headers += custom_target( wl_protos_src += custom_target(
xml.underscorify() + '_server_h', xml.underscorify() + '_server_h',
input: xml, input: xml,
output: '@BASENAME@-protocol.h', output: '@BASENAME@-protocol.h',
command: [wayland_scanner, 'server-header', '@INPUT@', '@OUTPUT@'], command: [wayland_scanner, 'server-header', '@INPUT@', '@OUTPUT@'],
) )
wl_protos_headers += custom_target( wl_protos_src += custom_target(
xml.underscorify() + '_client_h', xml.underscorify() + '_client_h',
input: xml, input: xml,
output: '@BASENAME@-client-protocol.h', output: '@BASENAME@-client-protocol.h',
command: [wayland_scanner, 'client-header', '@INPUT@', '@OUTPUT@'], command: [wayland_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
) )
endforeach endforeach
lib_client_protos = static_library(
'client_protos',
wl_protos_src + wl_protos_headers,
dependencies: wayland_client.partial_dependency(compile_args: true),
)
client_protos = declare_dependency(
link_with: lib_client_protos,
sources: wl_protos_headers,
)
lib_server_protos = static_library(
'server_protos',
wl_protos_src + wl_protos_headers,
dependencies: wayland_server.partial_dependency(compile_args: true),
)
server_protos = declare_dependency(
link_with: lib_server_protos,
sources: wl_protos_headers,
)

3
sway/meson.build
View File

@ -222,7 +222,6 @@ sway_deps = [
pcre2, pcre2,
glesv2, glesv2,
pixman, pixman,
server_protos,
threads, threads,
wayland_server, wayland_server,
wlroots, wlroots,
@ -237,7 +236,7 @@ endif
executable( executable(
'sway', 'sway',
sway_sources, sway_sources + wl_protos_src,
include_directories: [sway_inc], include_directories: [sway_inc],
dependencies: sway_deps, dependencies: sway_deps,
link_with: [lib_sway_common], link_with: [lib_sway_common],

4
swaybar/meson.build
View File

@ -8,7 +8,6 @@ tray_files = have_tray ? [
swaybar_deps = [ swaybar_deps = [
cairo, cairo,
client_protos,
gdk_pixbuf, gdk_pixbuf,
jsonc, jsonc,
math, math,
@ -32,7 +31,8 @@ executable(
'main.c', 'main.c',
'render.c', 'render.c',
'status_line.c', 'status_line.c',
tray_files tray_files,
wl_protos_src,
], ],
include_directories: [sway_inc], include_directories: [sway_inc],
dependencies: swaybar_deps, dependencies: swaybar_deps,

2
swaynag/meson.build
View File

@ -5,11 +5,11 @@ executable(
'render.c', 'render.c',
'swaynag.c', 'swaynag.c',
'types.c', 'types.c',
wl_protos_src,
], ],
include_directories: [sway_inc], include_directories: [sway_inc],
dependencies: [ dependencies: [
cairo, cairo,
client_protos,
pango, pango,
pangocairo, pangocairo,
wayland_client, wayland_client,