[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/9] migration: Move the creation of the library to the main m
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 5/9] migration: Move the creation of the library to the main meson.build |
Date: |
Tue, 6 Oct 2020 14:55:58 +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 +++++++
migration/meson.build | 8 +-------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build
index 3c0d7b4d44..0e3598e267 100644
--- a/meson.build
+++ b/meson.build
@@ -1328,6 +1328,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
- [PATCH v2 0/9] meson: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH v2 1/9] meson.build: Add comments to clarify code organization, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH v2 2/9] meson.build: Sort sourcesets alphabetically, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH v2 3/9] hw/core: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH v2 4/9] chardev: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH v2 5/9] migration: Move the creation of the library to the main meson.build,
Philippe Mathieu-Daudé <=
- [PATCH v2 6/9] io: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH v2 7/9] crypto: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH v2 8/9] authz: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- [PATCH v2 9/9] qom: Move the creation of the library to the main meson.build, Philippe Mathieu-Daudé, 2020/10/06
- Re: [PATCH v2 0/9] meson: Move the creation of the library to the main meson.build, no-reply, 2020/10/06
- Re: [PATCH v2 0/9] meson: Move the creation of the library to the main meson.build, Paolo Bonzini, 2020/10/06