mirror of https://gitlab.com/qemu-project/qemu
meson: remove unnecessary dependency
The dbus_display1_dep is not really used since all occurrences also request gio independently. Just list the generated sources and drop dbus_display1_dep. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
0241e0feda
commit
2bfd3c4860
|
@ -30,8 +30,8 @@ endforeach
|
||||||
|
|
||||||
if dbus_display
|
if dbus_display
|
||||||
module_ss = ss.source_set()
|
module_ss = ss.source_set()
|
||||||
module_ss.add(when: [gio, dbus_display1_dep, pixman],
|
module_ss.add(when: [gio, pixman],
|
||||||
if_true: files('dbusaudio.c'))
|
if_true: [dbus_display1, files('dbusaudio.c')])
|
||||||
audio_modules += {'dbus': module_ss}
|
audio_modules += {'dbus': module_ss}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -354,7 +354,7 @@ if vnc.found()
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if dbus_display
|
if dbus_display
|
||||||
qtests += {'dbus-display-test': [dbus_display1_dep, gio]}
|
qtests += {'dbus-display-test': [dbus_display1, gio]}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
qtest_executables = {}
|
qtest_executables = {}
|
||||||
|
|
|
@ -91,8 +91,7 @@ if dbus_display
|
||||||
'--interface-prefix', 'org.qemu.',
|
'--interface-prefix', 'org.qemu.',
|
||||||
'--c-namespace', 'QemuDBus',
|
'--c-namespace', 'QemuDBus',
|
||||||
'--generate-c-code', '@BASENAME@'])
|
'--generate-c-code', '@BASENAME@'])
|
||||||
dbus_display1_dep = declare_dependency(sources: dbus_display1, dependencies: gio)
|
dbus_ss.add(when: gio,
|
||||||
dbus_ss.add(when: [gio, dbus_display1_dep],
|
|
||||||
if_true: [files(
|
if_true: [files(
|
||||||
'dbus-chardev.c',
|
'dbus-chardev.c',
|
||||||
'dbus-clipboard.c',
|
'dbus-clipboard.c',
|
||||||
|
@ -100,7 +99,7 @@ if dbus_display
|
||||||
'dbus-error.c',
|
'dbus-error.c',
|
||||||
'dbus-listener.c',
|
'dbus-listener.c',
|
||||||
'dbus.c',
|
'dbus.c',
|
||||||
), opengl, gbm, pixman])
|
), opengl, gbm, pixman, dbus_display1])
|
||||||
ui_modules += {'dbus' : dbus_ss}
|
ui_modules += {'dbus' : dbus_ss}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue