[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 101/132] meson: convert hw/adc
From: |
Paolo Bonzini |
Subject: |
[PATCH 101/132] meson: convert hw/adc |
Date: |
Thu, 19 Dec 2019 13:23:21 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
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 c69c3aa..5823867 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 3f6dfde..0000000
--- a/hw/adc/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o
diff --git a/hw/adc/meson.build b/hw/adc/meson.build
new file mode 100644
index 0000000..2e7fea9
--- /dev/null
+++ b/hw/adc/meson.build
@@ -0,0 +1 @@
+specific_ss.add(when: 'CONFIG_STM32F2XX_ADC', if_true:
files('stm32f2xx_adc.c'))
diff --git a/hw/meson.build b/hw/meson.build
index 011139d..33d5f9f 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,3 +1,4 @@
+subdir('adc')
subdir('audio')
subdir('block')
subdir('bt')
--
1.8.3.1
- Re: [RFC PATCH v3 000/132] Proof of concept for Meson integration, (continued)
- Re: [RFC PATCH v3 000/132] Proof of concept for Meson integration, Markus Armbruster, 2019/12/19
- [PATCH 092/132] meson: convert hw/hyperv, Paolo Bonzini, 2019/12/19
- [PATCH 094/132] meson: convert hw/dma, Paolo Bonzini, 2019/12/19
- [PATCH 093/132] meson: convert hw/gpio, Paolo Bonzini, 2019/12/19
- [PATCH 095/132] meson: convert hw/display, Paolo Bonzini, 2019/12/19
- [PATCH 096/132] meson: convert hw/cpu, Paolo Bonzini, 2019/12/19
- [PATCH 098/132] meson: convert hw/bt, Paolo Bonzini, 2019/12/19
- [PATCH 097/132] meson: convert hw/char, Paolo Bonzini, 2019/12/19
- [PATCH 099/132] meson: convert hw/block, Paolo Bonzini, 2019/12/19
- [PATCH 100/132] meson: convert hw/audio, Paolo Bonzini, 2019/12/19
- [PATCH 101/132] meson: convert hw/adc,
Paolo Bonzini <=
- [PATCH 102/132] meson: convert hw/acpi, Paolo Bonzini, 2019/12/19
- [PATCH 103/132] meson: convert hw/9pfs, Paolo Bonzini, 2019/12/19
- [PATCH 104/132] meson: convert target/s390x/gen-features.h, Paolo Bonzini, 2019/12/19
- [PATCH 107/132] meson: accel, Paolo Bonzini, 2019/12/19
- [PATCH 105/132] meson: convert hw/arch*, Paolo Bonzini, 2019/12/19
- [PATCH 109/132] meson: bsd-user, Paolo Bonzini, 2019/12/19
- [PATCH 106/132] meson: target, Paolo Bonzini, 2019/12/19
- [PATCH 110/132] meson: cpu-emu, Paolo Bonzini, 2019/12/19
- [PATCH 111/132] meson: softmmu, Paolo Bonzini, 2019/12/19
- [PATCH 108/132] meson: linux-user, Paolo Bonzini, 2019/12/19