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

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

6
chardev/meson.build
View File

@ -1,4 +1,3 @@
chardev_ss = ss.source_set()
chardev_ss.add(files( chardev_ss.add(files(
'char-fe.c', 'char-fe.c',
'char-file.c', 'char-file.c',
@ -25,11 +24,6 @@ chardev_ss.add(when: 'CONFIG_WIN32', if_true: files(
)) ))
chardev_ss = chardev_ss.apply(config_host, strict: false) chardev_ss = chardev_ss.apply(config_host, strict: false)
libchardev = static_library('chardev', chardev_ss.sources() + genh,
name_suffix: 'fa',
build_by_default: false)
chardev = declare_dependency(link_whole: libchardev)
softmmu_ss.add(files('chardev-sysemu.c', 'msmouse.c', 'wctablet.c', 'testdev.c')) softmmu_ss.add(files('chardev-sysemu.c', 'msmouse.c', 'wctablet.c', 'testdev.c'))
softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: files('spice.c')) softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: files('spice.c'))

7
meson.build
View File

@ -1185,6 +1185,7 @@ sphinx_extn_depends = [ meson.source_root() / 'docs/sphinx/depfile.py',
blockdev_ss = ss.source_set() blockdev_ss = ss.source_set()
block_ss = ss.source_set() block_ss = ss.source_set()
bsd_user_ss = ss.source_set() bsd_user_ss = ss.source_set()
chardev_ss = ss.source_set()
common_ss = ss.source_set() common_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()
@ -1469,6 +1470,12 @@ libqmp = static_library('qmp', qmp_ss.sources() + genh,
qmp = declare_dependency(link_whole: [libqmp]) qmp = declare_dependency(link_whole: [libqmp])
libchardev = static_library('chardev', chardev_ss.sources() + genh,
name_suffix: 'fa',
build_by_default: false)
chardev = declare_dependency(link_whole: libchardev)
libhwcore = static_library('hwcore', sources: hwcore_files + genh, libhwcore = static_library('hwcore', sources: hwcore_files + genh,
name_suffix: 'fa', name_suffix: 'fa',
build_by_default: false) build_by_default: false)