From 52166bc1f530f477a6786707edf4b503e1a92cf5 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 25 Nov 2022 10:51:20 +0100 Subject: build: drop intermediate libraries for protocols (cherry picked from commit af8a5a8918ef42336194fb1077b008a736de7af9) --- protocols/meson.build | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'protocols') 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 = [ ] wl_protos_src = [] -wl_protos_headers = [] foreach xml : protocols wl_protos_src += custom_target( @@ -28,38 +27,16 @@ foreach xml : protocols output: '@BASENAME@-protocol.c', command: [wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'], ) - wl_protos_headers += custom_target( + wl_protos_src += custom_target( xml.underscorify() + '_server_h', input: xml, output: '@BASENAME@-protocol.h', command: [wayland_scanner, 'server-header', '@INPUT@', '@OUTPUT@'], ) - wl_protos_headers += custom_target( + wl_protos_src += custom_target( xml.underscorify() + '_client_h', input: xml, output: '@BASENAME@-client-protocol.h', command: [wayland_scanner, 'client-header', '@INPUT@', '@OUTPUT@'], ) 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, -) -- cgit v1.2.3-70-g09d2