summaryrefslogtreecommitdiffstats
path: root/protocols
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2022-11-25 10:51:20 +0100
committerLibravatar Simon Ser <contact@emersion.fr>2022-11-26 10:29:58 +0100
commit52166bc1f530f477a6786707edf4b503e1a92cf5 (patch)
tree2737d2cce6fa10770cbc403c8e2cb78ef2599fb2 /protocols
parentbuild: drop "server" from target name for protocol code (diff)
downloadsway-52166bc1f530f477a6786707edf4b503e1a92cf5.tar.gz
sway-52166bc1f530f477a6786707edf4b503e1a92cf5.tar.zst
sway-52166bc1f530f477a6786707edf4b503e1a92cf5.zip
build: drop intermediate libraries for protocols
(cherry picked from commit af8a5a8918ef42336194fb1077b008a736de7af9)
Diffstat (limited to 'protocols')
-rw-r--r--protocols/meson.build27
1 files changed, 2 insertions, 25 deletions
diff --git a/protocols/meson.build b/protocols/meson.build
index 53441f38..904aead4 100644
--- a/protocols/meson.build
+++ b/protocols/meson.build
@@ -19,7 +19,6 @@ protocols = [
19] 19]
20 20
21wl_protos_src = [] 21wl_protos_src = []
22wl_protos_headers = []
23 22
24foreach xml : protocols 23foreach xml : protocols
25 wl_protos_src += custom_target( 24 wl_protos_src += custom_target(
@@ -28,38 +27,16 @@ foreach xml : protocols
28 output: '@BASENAME@-protocol.c', 27 output: '@BASENAME@-protocol.c',
29 command: [wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'], 28 command: [wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'],
30 ) 29 )
31 wl_protos_headers += custom_target( 30 wl_protos_src += custom_target(
32 xml.underscorify() + '_server_h', 31 xml.underscorify() + '_server_h',
33 input: xml, 32 input: xml,
34 output: '@BASENAME@-protocol.h', 33 output: '@BASENAME@-protocol.h',
35 command: [wayland_scanner, 'server-header', '@INPUT@', '@OUTPUT@'], 34 command: [wayland_scanner, 'server-header', '@INPUT@', '@OUTPUT@'],
36 ) 35 )
37 wl_protos_headers += custom_target( 36 wl_protos_src += custom_target(
38 xml.underscorify() + '_client_h', 37 xml.underscorify() + '_client_h',
39 input: xml, 38 input: xml,
40 output: '@BASENAME@-client-protocol.h', 39 output: '@BASENAME@-client-protocol.h',
41 command: [wayland_scanner, 'client-header', '@INPUT@', '@OUTPUT@'], 40 command: [wayland_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
42 ) 41 )
43endforeach 42endforeach
44
45lib_client_protos = static_library(
46 'client_protos',
47 wl_protos_src + wl_protos_headers,
48 dependencies: wayland_client.partial_dependency(compile_args: true),
49)
50
51client_protos = declare_dependency(
52 link_with: lib_client_protos,
53 sources: wl_protos_headers,
54)
55
56lib_server_protos = static_library(
57 'server_protos',
58 wl_protos_src + wl_protos_headers,
59 dependencies: wayland_server.partial_dependency(compile_args: true),
60)
61
62server_protos = declare_dependency(
63 link_with: lib_server_protos,
64 sources: wl_protos_headers,
65)