[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v8 112/152] meson: convert hw/ipack
From: |
Paolo Bonzini |
Subject: |
[PULL v8 112/152] meson: convert hw/ipack |
Date: |
Fri, 21 Aug 2020 06:22:49 -0400 |
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/ipack/Makefile.objs | 2 --
hw/ipack/meson.build | 1 +
hw/meson.build | 1 +
4 files changed, 2 insertions(+), 3 deletions(-)
delete mode 100644 hw/ipack/Makefile.objs
create mode 100644 hw/ipack/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index f136377866..76d9305959 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -14,7 +14,6 @@ devices-dirs-$(CONFIG_I2C) += i2c/
devices-dirs-y += ide/
devices-dirs-y += input/
devices-dirs-y += intc/
-devices-dirs-$(CONFIG_IPACK) += ipack/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/ipack/Makefile.objs b/hw/ipack/Makefile.objs
deleted file mode 100644
index 8b9bdcb549..0000000000
--- a/hw/ipack/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-common-obj-$(CONFIG_IPACK) += ipack.o
-common-obj-$(CONFIG_IPACK) += tpci200.o
diff --git a/hw/ipack/meson.build b/hw/ipack/meson.build
new file mode 100644
index 0000000000..3f8138b6f2
--- /dev/null
+++ b/hw/ipack/meson.build
@@ -0,0 +1 @@
+softmmu_ss.add(when: 'CONFIG_IPACK', if_true: files('ipack.c', 'tpci200.c'))
diff --git a/hw/meson.build b/hw/meson.build
index 9796f95e5c..ec4bb48a0f 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('ipack')
subdir('ipmi')
subdir('isa')
subdir('mem')
--
2.26.2
- [PULL v8 099/152] meson: convert hw/ssi, (continued)
- [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, 2020/08/21
- [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 <=
- [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
- [PULL v8 092/152] meson: convert hw/watchdog, Paolo Bonzini, 2020/08/21
- [PULL v8 115/152] meson: convert hw/ide, Paolo Bonzini, 2020/08/21
- [PULL v8 117/152] meson: convert hw/hyperv, Paolo Bonzini, 2020/08/21
- [PULL v8 123/152] meson: convert hw/block, Paolo Bonzini, 2020/08/21
- [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