[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v8 125/152] meson: convert hw/adc
From: |
Paolo Bonzini |
Subject: |
[PULL v8 125/152] meson: convert hw/adc |
Date: |
Fri, 21 Aug 2020 06:23:02 -0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@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')
--
2.26.2
- [PULL v8 124/152] meson: convert hw/audio, (continued)
- [PULL v8 124/152] meson: convert hw/audio, Paolo Bonzini, 2020/08/21
- [PULL v8 113/152] meson: convert hw/intc, Paolo Bonzini, 2020/08/21
- [PULL v8 119/152] meson: convert hw/dma, Paolo Bonzini, 2020/08/21
- [PULL v8 114/152] meson: convert hw/input, Paolo Bonzini, 2020/08/21
- [PULL v8 122/152] meson: convert hw/char, Paolo Bonzini, 2020/08/21
- [PULL v8 127/152] meson: convert hw/9pfs, cleanup, Paolo Bonzini, 2020/08/21
- [PULL v8 111/152] meson: convert hw/ipmi, Paolo Bonzini, 2020/08/21
- [PULL v8 118/152] meson: convert hw/gpio, Paolo Bonzini, 2020/08/21
- [PULL v8 121/152] meson: convert hw/cpu, Paolo Bonzini, 2020/08/21
- [PULL v8 132/152] meson: bsd-user, Paolo Bonzini, 2020/08/21
- [PULL v8 125/152] meson: convert hw/adc,
Paolo Bonzini <=
- [PULL v8 120/152] meson: convert hw/display, Paolo Bonzini, 2020/08/21
- [PULL v8 128/152] meson: convert hw/arch*, Paolo Bonzini, 2020/08/21
- [PULL v8 130/152] meson: accel, Paolo Bonzini, 2020/08/21
- [PULL v8 134/152] meson: plugins, Paolo Bonzini, 2020/08/21
- [PULL v8 136/152] configure: place compatibility symlinks in target directories, Paolo Bonzini, 2020/08/21
- [PULL v8 133/152] meson: cpu-emu, Paolo Bonzini, 2020/08/21
- [PULL v8 138/152] rules.mak: remove version.o, Paolo Bonzini, 2020/08/21
- [PULL v8 135/152] meson: link emulators without Makefile.target, Paolo Bonzini, 2020/08/21
- [PULL v8 147/152] meson: move SDL and SDL-image detection to meson, Paolo Bonzini, 2020/08/21
- [PULL v8 126/152] meson: convert hw/acpi, Paolo Bonzini, 2020/08/21