[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/39] migration: Move the creation of the library to the main mes
From: |
Paolo Bonzini |
Subject: |
[PULL 05/39] migration: Move the creation of the library to the main meson.build |
Date: |
Sat, 10 Oct 2020 03:57:05 -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-6-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 7 +++++++
migration/meson.build | 8 +-------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build
index 39fc074977..dce48d8304 100644
--- a/meson.build
+++ b/meson.build
@@ -1451,6 +1451,13 @@ qemu_syms = custom_target('qemu.syms', output:
'qemu.syms',
# Library dependencies #
########################
+libmigration = static_library('migration', sources: migration_files + genh,
+ name_suffix: 'fa',
+ build_by_default: false)
+migration = declare_dependency(link_with: libmigration,
+ dependencies: [zlib, qom, io])
+softmmu_ss.add(migration)
+
block_ss = block_ss.apply(config_host, strict: false)
libblock = static_library('block', block_ss.sources() + genh,
dependencies: block_ss.dependencies(),
diff --git a/migration/meson.build b/migration/meson.build
index b5b71c8060..980e37865c 100644
--- a/migration/meson.build
+++ b/migration/meson.build
@@ -8,13 +8,7 @@ migration_files = files(
'qemu-file.c',
'qjson.c',
)
-
-libmigration = static_library('migration', sources: migration_files + genh,
- name_suffix: 'fa',
- build_by_default: false)
-migration = declare_dependency(link_with: libmigration,
- dependencies: [zlib, qom, io])
-softmmu_ss.add(migration)
+softmmu_ss.add(migration_files)
softmmu_ss.add(files(
'block-dirty-bitmap.c',
--
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 <=
- [PULL 03/39] hw/core: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/10
- [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