On 8/17/20 4:40 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/adc/Makefile.objs | 1 - > hw/adc/meson.build | 1 + > hw/meson.build | 1 + > 4 files changed, 2 insertions(+), 2 deletions(-) > delete mode 100644 hw/adc/Makefile.objs > create mode 100644 hw/adc/meson.build > > diff --git a/hw/Makefile.objs b/hw/Makefile.objs > index c0cbc0f132..4bdb674ef0 100644 > --- a/hw/Makefile.objs > +++ b/hw/Makefile.objs > @@ -1,7 +1,6 @@ > ifeq ($(CONFIG_SOFTMMU), y) > devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$(CONFIG_XEN))) += 9pfs/ > devices-dirs-y += acpi/ > -devices-dirs-y += adc/ > endif > > common-obj-y += $(devices-dirs-y) > diff --git a/hw/adc/Makefile.objs b/hw/adc/Makefile.objs > deleted file mode 100644 > index 2b9dc36c7f..0000000000 > --- a/hw/adc/Makefile.objs > +++ /dev/null > @@ -1 +0,0 @@ > -common-obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o > diff --git a/hw/adc/meson.build b/hw/adc/meson.build > new file mode 100644 > index 0000000000..0d62ae96ae > --- /dev/null > +++ b/hw/adc/meson.build > @@ -0,0 +1 @@ > +softmmu_ss.add(when: 'CONFIG_STM32F2XX_ADC', if_true: files('stm32f2xx_adc.c')) > diff --git a/hw/meson.build b/hw/meson.build > index 624335be90..ffa3f06dc0 100644 > --- a/hw/meson.build > +++ b/hw/meson.build > @@ -1,3 +1,4 @@ > +subdir('adc') > subdir('audio') > subdir('block') > subdir('char') > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/hw/Makefile.objs b/hw/Makefile.objs index c0cbc0f132..4bdb674ef0 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -1,7 +1,6 @@ ifeq ($(CONFIG_SOFTMMU), y) devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$(CONFIG_XEN))) += 9pfs/ devices-dirs-y += acpi/ -devices-dirs-y += adc/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/adc/Makefile.objs b/hw/adc/Makefile.objs deleted file mode 100644 index 2b9dc36c7f..0000000000 --- a/hw/adc/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -common-obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o diff --git a/hw/adc/meson.build b/hw/adc/meson.build new file mode 100644 index 0000000000..0d62ae96ae --- /dev/null +++ b/hw/adc/meson.build @@ -0,0 +1 @@ +softmmu_ss.add(when: 'CONFIG_STM32F2XX_ADC', if_true: files('stm32f2xx_adc.c')) diff --git a/hw/meson.build b/hw/meson.build index 624335be90..ffa3f06dc0 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('adc') subdir('audio') subdir('block') subdir('char')