diff options
| author | Marc-André Lureau | 2019-08-16 15:19:34 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2020-08-21 12:30:28 +0200 |
| commit | 00953fa550f4868c39a340001c9839cc9bb534f0 (patch) | |
| tree | 897b0afda21b1083deb5bbc492d273ab9eb793f4 | |
| parent | meson: convert hw/scsi (diff) | |
| download | qemu-00953fa550f4868c39a340001c9839cc9bb534f0.tar.gz qemu-00953fa550f4868c39a340001c9839cc9bb534f0.tar.xz qemu-00953fa550f4868c39a340001c9839cc9bb534f0.zip | |
meson: convert hw/pcmcia
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>
| -rw-r--r-- | hw/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/meson.build | 1 | ||||
| -rw-r--r-- | hw/pcmcia/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/pcmcia/meson.build | 2 |
4 files changed, 3 insertions, 3 deletions
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')) |