aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@redhat.com>2020-10-06 14:55:58 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2020-10-12 11:50:20 -0400
commit7e6edef3f8cd1176d267c86151c9cf2fc0777781 (patch)
treec3a6aaa24059b00f66b3ee17738b80f803e7a82a
parentc2306d713e4cfc95c25b395133e00a31d4e022c1 (diff)
migration: Move the creation of the library to the main meson.build
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>
-rw-r--r--meson.build7
-rw-r--r--migration/meson.build8
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',