aboutsummaryrefslogtreecommitdiffstats
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-25 10:51:20 +0100
commitaf8a5a8918ef42336194fb1077b008a736de7af9 (patch)
treec75c268d82f38a5bc4101fee40b985e3f12b5fea /protocols
parentbuild: drop "server" from target name for protocol code (diff)
downloadsway-af8a5a8918ef42336194fb1077b008a736de7af9.tar.gz
sway-af8a5a8918ef42336194fb1077b008a736de7af9.tar.zst
sway-af8a5a8918ef42336194fb1077b008a736de7af9.zip
build: drop intermediate libraries for protocols
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 0473b01f..e6fdec7d 100644
--- a/protocols/meson.build
+++ b/protocols/meson.build
@@ -20,7 +20,6 @@ protocols = [
20] 20]
21 21
22wl_protos_src = [] 22wl_protos_src = []
23wl_protos_headers = []
24 23
25foreach xml : protocols 24foreach xml : protocols
26 wl_protos_src += custom_target( 25 wl_protos_src += custom_target(
@@ -29,38 +28,16 @@ foreach xml : protocols
29 output: '@BASENAME@-protocol.c', 28 output: '@BASENAME@-protocol.c',
30 command: [wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'], 29 command: [wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'],
31 ) 30 )
32 wl_protos_headers += custom_target( 31 wl_protos_src += custom_target(
33 xml.underscorify() + '_server_h', 32 xml.underscorify() + '_server_h',
34 input: xml, 33 input: xml,
35 output: '@BASENAME@-protocol.h', 34 output: '@BASENAME@-protocol.h',
36 command: [wayland_scanner, 'server-header', '@INPUT@', '@OUTPUT@'], 35 command: [wayland_scanner, 'server-header', '@INPUT@', '@OUTPUT@'],
37 ) 36 )
38 wl_protos_headers += custom_target( 37 wl_protos_src += custom_target(
39 xml.underscorify() + '_client_h', 38 xml.underscorify() + '_client_h',
40 input: xml, 39 input: xml,
41 output: '@BASENAME@-client-protocol.h', 40 output: '@BASENAME@-client-protocol.h',
42 command: [wayland_scanner, 'client-header', '@INPUT@', '@OUTPUT@'], 41 command: [wayland_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
43 ) 42 )
44endforeach 43endforeach
45
46lib_client_protos = static_library(
47 'client_protos',
48 wl_protos_src + wl_protos_headers,
49 dependencies: wayland_client.partial_dependency(compile_args: true),
50)
51
52client_protos = declare_dependency(
53 link_with: lib_client_protos,
54 sources: wl_protos_headers,
55)
56
57lib_server_protos = static_library(
58 'server_protos',
59 wl_protos_src + wl_protos_headers,
60 dependencies: wayland_server.partial_dependency(compile_args: true),
61)
62
63server_protos = declare_dependency(
64 link_with: lib_server_protos,
65 sources: wl_protos_headers,
66)