Move D-Bus interface files to dedicated directory

Place the XML files in data/dbus-interfaces.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2126>
This commit is contained in:
Jonas Ådahl 2021-07-29 08:44:36 +02:00 committed by Marge Bot
parent d459df9a28
commit 3c1f50a85e
9 changed files with 9 additions and 6 deletions

View File

@ -0,0 +1 @@
dbus_interfaces_dir = meson.current_source_dir()

View File

@ -64,3 +64,5 @@ if have_libgudev
install_dir: join_paths(udev_dir, 'rules.d'), install_dir: join_paths(udev_dir, 'rules.d'),
) )
endif endif
subdir('dbus-interfaces')

View File

@ -824,14 +824,14 @@ if mutter_private_enum_sources.length() > 0
endif endif
dbus_display_config_built_sources = gnome.gdbus_codegen('meta-dbus-display-config', dbus_display_config_built_sources = gnome.gdbus_codegen('meta-dbus-display-config',
'org.gnome.Mutter.DisplayConfig.xml', join_paths(dbus_interfaces_dir, 'org.gnome.Mutter.DisplayConfig.xml'),
interface_prefix: 'org.gnome.Mutter.', interface_prefix: 'org.gnome.Mutter.',
namespace: 'MetaDBus', namespace: 'MetaDBus',
) )
mutter_built_sources += dbus_display_config_built_sources mutter_built_sources += dbus_display_config_built_sources
dbus_idle_monitor_built_sources = gnome.gdbus_codegen('meta-dbus-idle-monitor', dbus_idle_monitor_built_sources = gnome.gdbus_codegen('meta-dbus-idle-monitor',
'org.gnome.Mutter.IdleMonitor.xml', join_paths(dbus_interfaces_dir, 'org.gnome.Mutter.IdleMonitor.xml'),
interface_prefix: 'org.gnome.Mutter.', interface_prefix: 'org.gnome.Mutter.',
namespace: 'MetaDBus', namespace: 'MetaDBus',
object_manager: true, object_manager: true,
@ -870,7 +870,7 @@ if have_native_backend
mutter_built_sources += default_modes_h mutter_built_sources += default_modes_h
dbus_login1_built_sources = gnome.gdbus_codegen('meta-dbus-login1', dbus_login1_built_sources = gnome.gdbus_codegen('meta-dbus-login1',
'org.freedesktop.login1.xml', join_paths(dbus_interfaces_dir, 'org.freedesktop.login1.xml'),
interface_prefix: 'org.freedesktop.login1.', interface_prefix: 'org.freedesktop.login1.',
namespace: 'MetaDbusLogin1', namespace: 'MetaDbusLogin1',
) )
@ -879,14 +879,14 @@ endif
if have_remote_desktop if have_remote_desktop
dbus_remote_desktop_built_sources = gnome.gdbus_codegen('meta-dbus-remote-desktop', dbus_remote_desktop_built_sources = gnome.gdbus_codegen('meta-dbus-remote-desktop',
'org.gnome.Mutter.RemoteDesktop.xml', join_paths(dbus_interfaces_dir, 'org.gnome.Mutter.RemoteDesktop.xml'),
interface_prefix: 'org.gnome.Mutter.', interface_prefix: 'org.gnome.Mutter.',
namespace: 'MetaDBus', namespace: 'MetaDBus',
) )
mutter_built_sources += dbus_remote_desktop_built_sources mutter_built_sources += dbus_remote_desktop_built_sources
dbus_screen_cast_built_sources = gnome.gdbus_codegen('meta-dbus-screen-cast', dbus_screen_cast_built_sources = gnome.gdbus_codegen('meta-dbus-screen-cast',
'org.gnome.Mutter.ScreenCast.xml', join_paths(dbus_interfaces_dir, 'org.gnome.Mutter.ScreenCast.xml'),
interface_prefix: 'org.gnome.Mutter.', interface_prefix: 'org.gnome.Mutter.',
namespace: 'MetaDBus', namespace: 'MetaDBus',
) )
@ -894,7 +894,7 @@ if have_remote_desktop
endif endif
dbus_rtkit_built_sources = gnome.gdbus_codegen('meta-dbus-rtkit1', dbus_rtkit_built_sources = gnome.gdbus_codegen('meta-dbus-rtkit1',
'org.freedesktop.RealtimeKit1.xml', join_paths(dbus_interfaces_dir, 'org.freedesktop.RealtimeKit1.xml'),
interface_prefix: 'org.freedesktop.', interface_prefix: 'org.freedesktop.',
namespace: 'MetaDbus', namespace: 'MetaDbus',
) )