[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v8 102/152] meson: convert hw/pcmcia
From: |
Paolo Bonzini |
Subject: |
[PULL v8 102/152] meson: convert hw/pcmcia |
Date: |
Fri, 21 Aug 2020 06:22:39 -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/meson.build | 1 +
hw/pcmcia/Makefile.objs | 2 --
hw/pcmcia/meson.build | 2 ++
4 files changed, 3 insertions(+), 3 deletions(-)
delete mode 100644 hw/pcmcia/Makefile.objs
create mode 100644 hw/pcmcia/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index b6461c2f5e..f28da5869d 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -23,7 +23,6 @@ devices-dirs-y += rdma/
devices-dirs-y += nvram/
devices-dirs-y += pci/
devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
-devices-dirs-y += pcmcia/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index d4abb67715..ed25644237 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,6 +1,7 @@
subdir('core')
subdir('mem')
subdir('nubus')
+subdir('pcmcia')
subdir('rtc')
subdir('scsi')
subdir('sd')
diff --git a/hw/pcmcia/Makefile.objs b/hw/pcmcia/Makefile.objs
deleted file mode 100644
index 02cd986a2c..0000000000
--- a/hw/pcmcia/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-common-obj-y += pcmcia.o
-common-obj-$(CONFIG_PXA2XX) += pxa2xx.o
diff --git a/hw/pcmcia/meson.build b/hw/pcmcia/meson.build
new file mode 100644
index 0000000000..ab50bd325d
--- /dev/null
+++ b/hw/pcmcia/meson.build
@@ -0,0 +1,2 @@
+softmmu_ss.add(files('pcmcia.c'))
+softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c'))
--
2.26.2
- [PULL v8 093/152] meson: convert hw/virtio, (continued)
- [PULL v8 093/152] meson: convert hw/virtio, Paolo Bonzini, 2020/08/21
- [PULL v8 096/152] meson: convert hw/tpm, Paolo Bonzini, 2020/08/21
- [PULL v8 098/152] meson: convert hw/rtc, Paolo Bonzini, 2020/08/21
- [PULL v8 094/152] meson: convert hw/vfio, Paolo Bonzini, 2020/08/21
- [PULL v8 097/152] meson: convert hw/timer, Paolo Bonzini, 2020/08/21
- [PULL v8 095/152] meson: convert hw/usb, Paolo Bonzini, 2020/08/21
- [PULL v8 100/152] meson: convert hw/sd, Paolo Bonzini, 2020/08/21
- [PULL v8 088/152] meson: convert hw/semihosting, Paolo Bonzini, 2020/08/21
- [PULL v8 099/152] meson: convert hw/ssi, Paolo Bonzini, 2020/08/21
- [PULL v8 101/152] meson: convert hw/scsi, Paolo Bonzini, 2020/08/21
- [PULL v8 102/152] meson: convert hw/pcmcia,
Paolo Bonzini <=
- [PULL v8 108/152] meson: convert hw/net, Paolo Bonzini, 2020/08/21
- [PULL v8 105/152] meson: convert hw/pci, Paolo Bonzini, 2020/08/21
- [PULL v8 107/152] meson: convert hw/rdma, Paolo Bonzini, 2020/08/21
- [PULL v8 104/152] meson: convert hw/pci-bridge, Paolo Bonzini, 2020/08/21
- [PULL v8 103/152] meson: convert hw/pci-host, Paolo Bonzini, 2020/08/21
- [PULL v8 109/152] meson: convert hw/misc, Paolo Bonzini, 2020/08/21
- [PULL v8 116/152] meson: convert hw/i2c, Paolo Bonzini, 2020/08/21
- [PULL v8 112/152] meson: convert hw/ipack, Paolo Bonzini, 2020/08/21
- [PULL v8 110/152] meson: convert hw/isa, Paolo Bonzini, 2020/08/21
- [PULL v8 106/152] meson: convert hw/nvram, Paolo Bonzini, 2020/08/21