[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/10] hw/core: Move the creation of the library to the main meso
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 04/10] hw/core: Move the creation of the library to the main meson.build |
Date: |
Tue, 6 Oct 2020 13:12:13 +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 +++++++
hw/core/meson.build | 6 ------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index fc7792b769..ccfa3e9531 100644
--- a/meson.build
+++ b/meson.build
@@ -1346,6 +1346,13 @@ libqmp = static_library('qmp', qmp_ss.sources() + genh,
qmp = declare_dependency(link_whole: [libqmp])
+libhwcore = static_library('hwcore', sources: hwcore_files + genh,
+ name_suffix: 'fa',
+ build_by_default: false)
+hwcore = declare_dependency(link_whole: libhwcore)
+common_ss.add(hwcore)
+
+
foreach m : block_mods + softmmu_mods
shared_module(m.name(),
name_prefix: '',
diff --git a/hw/core/meson.build b/hw/core/meson.build
index fc91f98075..4a744f3b5e 100644
--- a/hw/core/meson.build
+++ b/hw/core/meson.build
@@ -14,12 +14,6 @@ hwcore_files = files(
'qdev-clock.c',
)
-libhwcore = static_library('hwcore', sources: hwcore_files + genh,
- name_suffix: 'fa',
- build_by_default: false)
-hwcore = declare_dependency(link_whole: libhwcore)
-common_ss.add(hwcore)
-
common_ss.add(files('cpu.c'))
common_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c'))
common_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true:
files('generic-loader.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é <=
- [PATCH 05/10] chardev: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [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