diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2020-10-06 14:55:57 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-12 11:50:19 -0400 |
| commit | c2306d713e4cfc95c25b395133e00a31d4e022c1 (patch) | |
| tree | 7441acdf8574361b1b6a17407f5d45d5c997da11 | |
| parent | e28ab096bf897310fc7a37fdc087e66a24e6e977 (diff) | |
| download | qemu-c2306d713e4cfc95c25b395133e00a31d4e022c1.zip qemu-c2306d713e4cfc95c25b395133e00a31d4e022c1.tar.gz qemu-c2306d713e4cfc95c25b395133e00a31d4e022c1.tar.bz2 | |
chardev: 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-5-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | chardev/meson.build | 6 | ||||
| -rw-r--r-- | meson.build | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/chardev/meson.build b/chardev/meson.build index 54e88d0..dd2699a 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -1,4 +1,3 @@ -chardev_ss = ss.source_set() chardev_ss.add(files( 'char-fe.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) -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(when: ['CONFIG_SPICE', spice], if_true: files('spice.c')) diff --git a/meson.build b/meson.build index 6c760b4..39fc074 100644 --- a/meson.build +++ b/meson.build @@ -1185,6 +1185,7 @@ sphinx_extn_depends = [ meson.source_root() / 'docs/sphinx/depfile.py', blockdev_ss = ss.source_set() block_ss = ss.source_set() bsd_user_ss = ss.source_set() +chardev_ss = ss.source_set() common_ss = ss.source_set() linux_user_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]) +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, name_suffix: 'fa', build_by_default: false) |