[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 110/150] meson: convert hw/ipack
From: |
Paolo Bonzini |
Subject: |
[PATCH 110/150] meson: convert hw/ipack |
Date: |
Mon, 17 Aug 2020 16:40:13 +0200 |
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
- [PATCH 102/150] meson: convert hw/pci-bridge, (continued)
- [PATCH 102/150] meson: convert hw/pci-bridge, Paolo Bonzini, 2020/08/17
- [PATCH 104/150] meson: convert hw/nvram, Paolo Bonzini, 2020/08/17
- [PATCH 105/150] meson: convert hw/rdma, Paolo Bonzini, 2020/08/17
- [PATCH 106/150] meson: convert hw/net, Paolo Bonzini, 2020/08/17
- [PATCH 107/150] meson: convert hw/misc, Paolo Bonzini, 2020/08/17
- [PATCH 108/150] meson: convert hw/isa, Paolo Bonzini, 2020/08/17
- [PATCH 109/150] meson: convert hw/ipmi, Paolo Bonzini, 2020/08/17
- [PATCH 110/150] meson: convert hw/ipack,
Paolo Bonzini <=
- [PATCH 111/150] meson: convert hw/intc, Paolo Bonzini, 2020/08/17
- [PATCH 112/150] meson: convert hw/input, Paolo Bonzini, 2020/08/17
- [PATCH 113/150] meson: convert hw/ide, Paolo Bonzini, 2020/08/17
- [PATCH 114/150] meson: convert hw/i2c, Paolo Bonzini, 2020/08/17
- [PATCH 115/150] meson: convert hw/hyperv, Paolo Bonzini, 2020/08/17
- [PATCH 116/150] meson: convert hw/gpio, Paolo Bonzini, 2020/08/17
- [PATCH 117/150] meson: convert hw/dma, Paolo Bonzini, 2020/08/17
- [PATCH 118/150] meson: convert hw/display, Paolo Bonzini, 2020/08/17
- [PATCH 119/150] meson: convert hw/cpu, Paolo Bonzini, 2020/08/17