aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2019-08-16 18:23:55 +0400
committerPaolo Bonzini <pbonzini@redhat.com>2020-08-21 06:30:30 -0400
commitae36d233d37ab80245ac23f1ce04e97b0df6805d (patch)
tree142c2ae7829852c41e74de0dbc7f40429795784e
parenta7b9b7d1d709ba2c5e089f9d69f00df7404c43f7 (diff)
downloadqemu-ae36d233d37ab80245ac23f1ce04e97b0df6805d.zip
qemu-ae36d233d37ab80245ac23f1ce04e97b0df6805d.tar.gz
qemu-ae36d233d37ab80245ac23f1ce04e97b0df6805d.tar.bz2
meson: convert hw/ipack
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--hw/Makefile.objs1
-rw-r--r--hw/ipack/Makefile.objs2
-rw-r--r--hw/ipack/meson.build1
-rw-r--r--hw/meson.build1
4 files changed, 2 insertions, 3 deletions
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index f136377..76d9305 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 8b9bdcb..0000000
--- 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 0000000..3f8138b
--- /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 9796f95..ec4bb48 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('ipack')
subdir('ipmi')
subdir('isa')
subdir('mem')