Re: [PATCH 06/10] migration: Move the creation of the library to the main meson.build

[Paolo Bonzini]

On 06/10/20 13:12, Philippe Mathieu-Daudé wrote:
> 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           | 6 ++++++
>  migration/meson.build | 6 ------
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 6bec7a0994..55966c3b60 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1328,6 +1328,12 @@ 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])
> +
>  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 55c9e1329f..980e37865c 100644
> --- a/migration/meson.build
> +++ b/migration/meson.build
> @@ -8,12 +8,6 @@ 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_files)
>  
>  softmmu_ss.add(files(
> 

You can move add softmmu_ss.add(migration) to the toplevel meson.build
too, together with the other dependencies.

Paolo