Re: [PATCH 090/150] meson: convert hw/watchdog

[Philippe Mathieu-Daudé]

On 8/17/20 4:36 PM, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  hw/Makefile.objs          | 1 -
>  hw/meson.build            | 1 +
>  hw/watchdog/Makefile.objs | 7 -------
>  hw/watchdog/meson.build   | 7 +++++++
>  4 files changed, 8 insertions(+), 8 deletions(-)
>  delete mode 100644 hw/watchdog/Makefile.objs
>  create mode 100644 hw/watchdog/meson.build
> 
> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> index df72b25a64..9ebd13d7cd 100644
> --- a/hw/Makefile.objs
> +++ b/hw/Makefile.objs
> @@ -33,7 +33,6 @@ devices-dirs-$(CONFIG_TPM) += tpm/
>  devices-dirs-y += usb/
>  devices-dirs-$(CONFIG_VFIO) += vfio/
>  devices-dirs-y += virtio/
> -devices-dirs-y += watchdog/
>  endif
>  
>  common-obj-y += $(devices-dirs-y)
> diff --git a/hw/meson.build b/hw/meson.build
> index 542d675618..f2209d900c 100644
> --- a/hw/meson.build
> +++ b/hw/meson.build
> @@ -3,4 +3,5 @@ subdir('mem')
>  subdir('nubus')
>  subdir('semihosting')
>  subdir('smbios')
> +subdir('watchdog')
>  subdir('xen')
> diff --git a/hw/watchdog/Makefile.objs b/hw/watchdog/Makefile.objs
> deleted file mode 100644
> index 631b711d86..0000000000
> --- a/hw/watchdog/Makefile.objs
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -common-obj-y += watchdog.o
> -common-obj-$(CONFIG_CMSDK_APB_WATCHDOG) += cmsdk-apb-watchdog.o
> -common-obj-$(CONFIG_WDT_IB6300ESB) += wdt_i6300esb.o
> -common-obj-$(CONFIG_WDT_IB700) += wdt_ib700.o
> -common-obj-$(CONFIG_WDT_DIAG288) += wdt_diag288.o
> -common-obj-$(CONFIG_ASPEED_SOC) += wdt_aspeed.o
> -common-obj-$(CONFIG_WDT_IMX2) += wdt_imx2.o
> diff --git a/hw/watchdog/meson.build b/hw/watchdog/meson.build
> new file mode 100644
> index 0000000000..9b8725e642
> --- /dev/null
> +++ b/hw/watchdog/meson.build
> @@ -0,0 +1,7 @@
> +softmmu_ss.add(files('watchdog.c'))
> +softmmu_ss.add(when: 'CONFIG_CMSDK_APB_WATCHDOG', if_true: 
> files('cmsdk-apb-watchdog.c'))
> +softmmu_ss.add(when: 'CONFIG_WDT_IB6300ESB', if_true: 
> files('wdt_i6300esb.c'))
> +softmmu_ss.add(when: 'CONFIG_WDT_IB700', if_true: files('wdt_ib700.c'))
> +softmmu_ss.add(when: 'CONFIG_WDT_DIAG288', if_true: files('wdt_diag288.c'))
> +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('wdt_aspeed.c'))
> +softmmu_ss.add(when: 'CONFIG_WDT_IMX2', if_true: files('wdt_imx2.c'))

This one is not sorted alphabetically!

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>