OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qom: Move the creation of the library to the main meson.build

Browse Source 
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-10-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-10-06 14:56:02 +02:00 committed by Paolo Bonzini
parent 5556789176
commit da33fc0987
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -1192,6 +1192,7 @@ crypto_ss = ss.source_set()
io_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()
qom_ss = ss.source_set()
softmmu_ss = ss.source_set() softmmu_ss = ss.source_set()
specific_fuzz_ss = ss.source_set() specific_fuzz_ss = ss.source_set()
specific_ss = ss.source_set() specific_ss = ss.source_set()
@ -1454,6 +1455,13 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms',
# Library dependencies # # Library dependencies #
######################## ########################
qom_ss = qom_ss.apply(config_host, strict: false)
libqom = static_library('qom', qom_ss.sources() + genh,
dependencies: [qom_ss.dependencies()],
name_suffix: 'fa')
qom = declare_dependency(link_whole: libqom)
authz_ss = authz_ss.apply(config_host, strict: false) authz_ss = authz_ss.apply(config_host, strict: false)
libauthz = static_library('authz', authz_ss.sources() + genh, libauthz = static_library('authz', authz_ss.sources() + genh,
dependencies: [authz_ss.dependencies()], dependencies: [authz_ss.dependencies()],

8
qom/meson.build
View File

@ -1,4 +1,3 @@
qom_ss = ss.source_set()
qom_ss.add(genh) qom_ss.add(genh)
qom_ss.add(files( qom_ss.add(files(
'container.c', 'container.c',
@ -9,10 +8,3 @@ qom_ss.add(files(
qmp_ss.add(files('qom-qmp-cmds.c')) qmp_ss.add(files('qom-qmp-cmds.c'))
softmmu_ss.add(files('qom-hmp-cmds.c')) softmmu_ss.add(files('qom-hmp-cmds.c'))
qom_ss = qom_ss.apply(config_host, strict: false)
libqom = static_library('qom', qom_ss.sources() + genh,
dependencies: [qom_ss.dependencies()],
name_suffix: 'fa')
qom = declare_dependency(link_whole: libqom)