build: Make input-capture use declarative D-Bus code generation

This was cleaned up, but a input capture rebased didn't port to the new
way of declaring what D-Bus protocol files that should go through code
generation.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3432>
This commit is contained in:
Jonas Ådahl 2023-10-24 23:21:24 +08:00 committed by Marge Bot
parent 294739db15
commit d5253b1385
2 changed files with 6 additions and 8 deletions

View File

@ -924,6 +924,11 @@ dbus_interfaces = [
'prefix': 'org.gnome.Mutter.', 'prefix': 'org.gnome.Mutter.',
'object_manager': true, 'object_manager': true,
}, },
{
'name': 'meta-dbus-input-capture',
'interface': 'org.gnome.Mutter.InputCapture.xml',
'prefix': 'org.gnome.Mutter',
},
{ {
'name': 'meta-dbus-input-mapping', 'name': 'meta-dbus-input-mapping',
'interface': 'org.gnome.Mutter.InputMapping.xml', 'interface': 'org.gnome.Mutter.InputMapping.xml',
@ -1036,13 +1041,6 @@ foreach dbus_interface: dbus_interfaces
mutter_built_sources += dbus_sources mutter_built_sources += dbus_sources
endforeach endforeach
dbus_input_capture_built_sources = gnome.gdbus_codegen('meta-dbus-input-capture',
dbus_interfaces_dir / 'org.gnome.Mutter.InputCapture.xml',
interface_prefix: 'org.gnome.Mutter',
namespace: 'MetaDBus',
)
mutter_built_sources += dbus_input_capture_built_sources
wayland_protocol_server_headers = [] wayland_protocol_server_headers = []
wayland_protocol_client_headers = [] wayland_protocol_client_headers = []
wayland_protocol_sources = [] wayland_protocol_sources = []

View File

@ -322,7 +322,7 @@ if have_native_tests
'input-capture-test-client.c', 'input-capture-test-client.c',
'../backends/meta-fd-source.c', '../backends/meta-fd-source.c',
'../backends/meta-fd-source.h', '../backends/meta-fd-source.h',
dbus_input_capture_built_sources, built_dbus_sources['meta-dbus-input-capture'],
], ],
include_directories: tests_includes, include_directories: tests_includes,
c_args: [ c_args: [