[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/10] chardev: Move the creation of the library to the main meso
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 05/10] chardev: Move the creation of the library to the main meson.build |
Date: |
Tue, 6 Oct 2020 13:12:14 +0200 |
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>
---
meson.build | 7 +++++++
chardev/meson.build | 6 ------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index ccfa3e9531..6bec7a0994 100644
--- a/meson.build
+++ b/meson.build
@@ -1062,6 +1062,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()
@@ -1346,6 +1347,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)
diff --git a/chardev/meson.build b/chardev/meson.build
index 54e88d0310..dd2699a11b 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'))
--
2.26.2
- [PATCH 00/10] meson: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [RFC PATCH 01/10] migration: Only add migration files to the Meson sourceset, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH 02/10] meson.build: Add comments to clarify code organization, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH 03/10] meson.build: Sort sourcesets alphabetically, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH 04/10] hw/core: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH 05/10] chardev: Move the creation of the library to the main meson.build,
Philippe Mathieu-Daudé <=
- [PATCH 06/10] migration: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH 08/10] crypto: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH 07/10] io: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH 09/10] authz: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH 10/10] qom: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- Re: [PATCH 00/10] meson: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/06