Pierrick Bouvier <[email protected]> writes:
> Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
> Reviewed-by: Manos Pitsidianakis <[email protected]>
> Signed-off-by: Pierrick Bouvier <[email protected]>
> ---
> contrib/plugins/meson.build | 10 +++++-----
> tests/tcg/plugins/meson.build | 7 +++++--
> 2 files changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/contrib/plugins/meson.build b/contrib/plugins/meson.build
> index 6915ffa5fbc..3d2d7862e0c 100644
> --- a/contrib/plugins/meson.build
> +++ b/contrib/plugins/meson.build
> @@ -1,15 +1,15 @@
> -contrib_plugins = ['bbv', 'cache', 'cflow', 'drcov', 'execlog', 'hotblocks',
> - 'hotpages', 'howvec', 'hwprofile', 'ips', 'stoptrigger',
> - 'traps', 'uftrace']
> +contrib_plugins = ['bbv.c', 'cache.c', 'cflow.c', 'drcov.c', 'execlog.c',
> + 'hotblocks.c', 'hotpages.c', 'howvec.c', 'hwprofile.c',
> + 'ips.c', 'stoptrigger.c', 'traps.c', 'uftrace.c']
Argh this keeps conflicting with other changes. Maybe we should make
this a dumb list:
contrib_plugins = [ ]
contrib_plugins += 'bbv.c'
contrib_plugins += 'cache.c'
etc?
> if host_os != 'windows'
> # lockstep uses socket.h
> - contrib_plugins += 'lockstep'
> + contrib_plugins += 'lockstep.c'
> endif
>
> t = []
> if get_option('plugins')
> foreach i : contrib_plugins
> - t += shared_module(i, files(i + '.c'),
> + t += shared_module(fs.stem(i), files(i),
> dependencies: plugins_deps)
> endforeach
> endif
> diff --git a/tests/tcg/plugins/meson.build b/tests/tcg/plugins/meson.build
> index d7823704616..303f97f9679 100644
> --- a/tests/tcg/plugins/meson.build
> +++ b/tests/tcg/plugins/meson.build
> @@ -1,7 +1,10 @@
> +test_plugins = ['bb.c', 'discons.c', 'empty.c', 'inline.c', 'insn.c',
> 'mem.c',
> + 'reset.c', 'syscall.c', 'patch.c']
> +
> t = []
> if get_option('plugins')
> - foreach i : ['bb', 'discons', 'empty', 'inline', 'insn', 'mem', 'reset',
> 'syscall', 'patch']
> - t += shared_module(i, files(i + '.c'),
> + foreach i : test_plugins
> + t += shared_module(fs.stem(i), files(i),
> dependencies: plugins_deps)
> endforeach
> endif
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
