[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/39] hw/core: Move the creation of the library to the main meson
From: |
Paolo Bonzini |
Subject: |
[PULL 03/39] hw/core: Move the creation of the library to the main meson.build |
Date: |
Sat, 10 Oct 2020 03:57:03 -0400 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
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-4-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/core/meson.build | 6 ------
meson.build | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
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'))
diff --git a/meson.build b/meson.build
index adcfb494a8..6c760b4163 100644
--- a/meson.build
+++ b/meson.build
@@ -1469,6 +1469,12 @@ 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)
+
###########
# Targets #
###########
--
2.26.2
- [PULL 00/39] SCSI, qdev, qtest, meson patches for 2020-10-10, Paolo Bonzini, 2020/10/10
- [PULL 01/39] meson.build: Add comments to clarify code organization, Paolo Bonzini, 2020/10/10
- [PULL 05/39] migration: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/10
- [PULL 03/39] hw/core: Move the creation of the library to the main meson.build,
Paolo Bonzini <=
- [PULL 02/39] meson.build: Sort sourcesets alphabetically, Paolo Bonzini, 2020/10/10
- [PULL 04/39] chardev: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/10
- [PULL 10/39] hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE, Paolo Bonzini, 2020/10/10
- [PULL 15/39] docs: Move QTest documentation to its own document, Paolo Bonzini, 2020/10/10
- [PULL 08/39] authz: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/10
- [PULL 16/39] docs/devel/qtest: Include protocol spec in document, Paolo Bonzini, 2020/10/10
- [PULL 06/39] io: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/10
- [PULL 09/39] qom: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/10
- [PULL 07/39] crypto: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/10
- [PULL 11/39] softmmu: move more files to softmmu/, Paolo Bonzini, 2020/10/10