diff --git a/bar/meson.build b/bar/meson.build index 5df4b09..90f050b 100644 --- a/bar/meson.build +++ b/bar/meson.build @@ -17,7 +17,6 @@ if backend_wayland wl_proto_src = [] foreach prot : [ '../external/wlr-layer-shell-unstable-v1.xml', - '../external/river-status-unstable-v1.xml', wayland_protocols_datadir + '/stable/xdg-shell/xdg-shell.xml', wayland_protocols_datadir + '/unstable/xdg-output/xdg-output-unstable-v1.xml'] diff --git a/modules/meson.build b/modules/meson.build index 3efcc9e..e05362f 100644 --- a/modules/meson.build +++ b/modules/meson.build @@ -30,8 +30,26 @@ if backend_x11 endif if backend_wayland + river_proto_headers = [] + river_proto_src = [] + + foreach prot : ['../external/river-status-unstable-v1.xml'] + + river_proto_headers += custom_target( + prot.underscorify() + '-client-header', + output: '@BASENAME@.h', + input: prot, + command: [wscanner_prog, 'client-header', '@INPUT@', '@OUTPUT@']) + + river_proto_src += custom_target( + prot.underscorify() + '-private-code', + output: '@BASENAME@.c', + input: prot, + command: [wscanner_prog, 'private-code', '@INPUT@', '@OUTPUT@']) + endforeach + deps += { - 'river': [[], []], + 'river': [[wl_proto_src + wl_proto_headers + river_proto_src + river_proto_headers], []], } endif