mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-15 07:22:46 +00:00
io: Move the creation of the library to the main meson.build
Be consistent creating all the libraries in the main meson.build file. Suggested-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20201006125602.2311423-7-philmd@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
7e6edef3f8
commit
f78536b149
|
@ -1,4 +1,3 @@
|
||||||
io_ss = ss.source_set()
|
|
||||||
io_ss.add(genh)
|
io_ss.add(genh)
|
||||||
io_ss.add(files(
|
io_ss.add(files(
|
||||||
'channel-buffer.c',
|
'channel-buffer.c',
|
||||||
|
@ -14,12 +13,3 @@ io_ss.add(files(
|
||||||
'net-listener.c',
|
'net-listener.c',
|
||||||
'task.c',
|
'task.c',
|
||||||
))
|
))
|
||||||
|
|
||||||
io_ss = io_ss.apply(config_host, strict: false)
|
|
||||||
libio = static_library('io', io_ss.sources() + genh,
|
|
||||||
dependencies: [io_ss.dependencies()],
|
|
||||||
link_with: libqemuutil,
|
|
||||||
name_suffix: 'fa',
|
|
||||||
build_by_default: false)
|
|
||||||
|
|
||||||
io = declare_dependency(link_whole: libio, dependencies: [crypto, qom])
|
|
||||||
|
|
10
meson.build
10
meson.build
|
@ -1187,6 +1187,7 @@ block_ss = ss.source_set()
|
||||||
bsd_user_ss = ss.source_set()
|
bsd_user_ss = ss.source_set()
|
||||||
chardev_ss = ss.source_set()
|
chardev_ss = ss.source_set()
|
||||||
common_ss = ss.source_set()
|
common_ss = ss.source_set()
|
||||||
|
io_ss = ss.source_set()
|
||||||
linux_user_ss = ss.source_set()
|
linux_user_ss = ss.source_set()
|
||||||
qmp_ss = ss.source_set()
|
qmp_ss = ss.source_set()
|
||||||
softmmu_ss = ss.source_set()
|
softmmu_ss = ss.source_set()
|
||||||
|
@ -1451,6 +1452,15 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms',
|
||||||
# Library dependencies #
|
# Library dependencies #
|
||||||
########################
|
########################
|
||||||
|
|
||||||
|
io_ss = io_ss.apply(config_host, strict: false)
|
||||||
|
libio = static_library('io', io_ss.sources() + genh,
|
||||||
|
dependencies: [io_ss.dependencies()],
|
||||||
|
link_with: libqemuutil,
|
||||||
|
name_suffix: 'fa',
|
||||||
|
build_by_default: false)
|
||||||
|
|
||||||
|
io = declare_dependency(link_whole: libio, dependencies: [crypto, qom])
|
||||||
|
|
||||||
libmigration = static_library('migration', sources: migration_files + genh,
|
libmigration = static_library('migration', sources: migration_files + genh,
|
||||||
name_suffix: 'fa',
|
name_suffix: 'fa',
|
||||||
build_by_default: false)
|
build_by_default: false)
|
||||||
|
|
Loading…
Reference in a new issue