Re: [PATCH v2 3/6] Makefile: Restrict system emulation and tools objects

[Alex Bennée]

Philippe Mathieu-Daudé <address@hidden> writes:

> Restrict all the system emulation and tools objects with a
> Makefile IF (CONFIG_SOFTMMU OR CONFIG_TOOLS) check.
>
> Using the same description over and over is not very helpful.
> Use it once, just before the if() block.
>
> Reviewed-by: Thomas Huth <address@hidden>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>

Reviewed-by: Alex Bennée <address@hidden>

> ---
>  Makefile.objs | 19 +++++++------------
>  1 file changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/Makefile.objs b/Makefile.objs
> index 5aae561984..395dd1e670 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -4,16 +4,15 @@ stub-obj-y = stubs/
>  util-obj-y = crypto/ util/ qobject/ qapi/
>  qom-obj-y = qom/
>  
> +#######################################################################
> +# code used by both qemu system emulation and qemu-img
> +
> +ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)
> +
>  chardev-obj-y = chardev/
>  
> -#######################################################################
> -# authz-obj-y is code used by both qemu system emulation and qemu-img
> -
>  authz-obj-y = authz/
>  
> -#######################################################################
> -# block-obj-y is code used by both qemu system emulation and qemu-img
> -
>  block-obj-y = nbd/
>  block-obj-y += block.o blockjob.o job.o
>  block-obj-y += block/ scsi/
> @@ -22,16 +21,12 @@ block-obj-$(CONFIG_REPLICATION) += replication.o
>  
>  block-obj-m = block/
>  
> -#######################################################################
> -# crypto-obj-y is code used by both qemu system emulation and qemu-img
> -
>  crypto-obj-y = crypto/
>  
> -#######################################################################
> -# io-obj-y is code used by both qemu system emulation and qemu-img
> -
>  io-obj-y = io/
>  
> +endif # CONFIG_SOFTMMU or CONFIG_TOOLS
> +
>  ######################################################################
>  # Target independent part of system emulation. The long term path is to
>  # suppress *all* target specific code in case of system emulation, i.e. a


-- 
Alex Bennée