[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 086/132] meson: convert hw/ipmi
From: |
Paolo Bonzini |
Subject: |
[PATCH 086/132] meson: convert hw/ipmi |
Date: |
Thu, 12 Dec 2019 13:52:10 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/Makefile.objs | 1 -
hw/ipmi/Makefile.objs | 5 -----
hw/ipmi/meson.build | 8 ++++++++
hw/meson.build | 1 +
4 files changed, 9 insertions(+), 6 deletions(-)
delete mode 100644 hw/ipmi/Makefile.objs
create mode 100644 hw/ipmi/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 1dd9f63..7d85aba 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -16,7 +16,6 @@ devices-dirs-y += ide/
devices-dirs-y += input/
devices-dirs-y += intc/
devices-dirs-$(CONFIG_IPACK) += ipack/
-devices-dirs-$(CONFIG_IPMI) += ipmi/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/ipmi/Makefile.objs b/hw/ipmi/Makefile.objs
deleted file mode 100644
index 1b422bb..0000000
--- a/hw/ipmi/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-common-obj-$(CONFIG_IPMI) += ipmi.o
-common-obj-$(CONFIG_IPMI_LOCAL) += ipmi_bmc_sim.o
-common-obj-$(CONFIG_IPMI_EXTERN) += ipmi_bmc_extern.o
-common-obj-$(CONFIG_ISA_IPMI_KCS) += isa_ipmi_kcs.o
-common-obj-$(CONFIG_ISA_IPMI_BT) += isa_ipmi_bt.o
diff --git a/hw/ipmi/meson.build b/hw/ipmi/meson.build
new file mode 100644
index 0000000..47671ba
--- /dev/null
+++ b/hw/ipmi/meson.build
@@ -0,0 +1,8 @@
+ipmi_ss = ss.source_set()
+ipmi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'))
+ipmi_ss.add(when: 'CONFIG_IPMI_LOCAL', if_true: files('ipmi_bmc_sim.c'))
+ipmi_ss.add(when: 'CONFIG_IPMI_EXTERN', if_true: files('ipmi_bmc_extern.c'))
+ipmi_ss.add(when: 'CONFIG_ISA_IPMI_KCS', if_true: files('isa_ipmi_kcs.c'))
+ipmi_ss.add(when: 'CONFIG_ISA_IPMI_BT', if_true: files('isa_ipmi_bt.c'))
+
+softmmu_ss.add_all(when: 'CONFIG_IPMI', if_true: ipmi_ss)
diff --git a/hw/meson.build b/hw/meson.build
index db35232..276f9ed 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('ipmi')
subdir('isa')
subdir('mem')
subdir('misc')
--
1.8.3.1
- [PATCH 076/132] meson: convert hw/scsi, (continued)
- [PATCH 076/132] meson: convert hw/scsi, Paolo Bonzini, 2019/12/12
- [PATCH 078/132] meson: convert hw/pci-host, Paolo Bonzini, 2019/12/12
- [PATCH 077/132] meson: convert hw/pcmcia, Paolo Bonzini, 2019/12/12
- [PATCH 079/132] meson: convert hw/pci-bridge, Paolo Bonzini, 2019/12/12
- [PATCH 080/132] meson: convert hw/pci, Paolo Bonzini, 2019/12/12
- [PATCH 081/132] meson: convert hw/nvram, Paolo Bonzini, 2019/12/12
- [PATCH 082/132] meson: convert hw/rdma, Paolo Bonzini, 2019/12/12
- [PATCH 083/132] meson: convert hw/net, Paolo Bonzini, 2019/12/12
- [PATCH 085/132] meson: convert hw/isa, Paolo Bonzini, 2019/12/12
- [PATCH 084/132] meson: convert hw/misc, Paolo Bonzini, 2019/12/12
- [PATCH 086/132] meson: convert hw/ipmi,
Paolo Bonzini <=
- [PATCH 087/132] meson: convert hw/ipack, Paolo Bonzini, 2019/12/12
- [PATCH 088/132] meson: convert hw/intc, Paolo Bonzini, 2019/12/12
- [PATCH 089/132] meson: convert hw/input, Paolo Bonzini, 2019/12/12
- [PATCH 090/132] meson: convert hw/ide, Paolo Bonzini, 2019/12/12
- [PATCH 092/132] meson: convert hw/hyperv, Paolo Bonzini, 2019/12/12
- [PATCH 091/132] meson: convert hw/i2c, Paolo Bonzini, 2019/12/12
- [PATCH 093/132] meson: convert hw/gpio, Paolo Bonzini, 2019/12/12
- Re: [RFC PATCH v3 000/132] Proof of concept for Meson integration, Markus Armbruster, 2019/12/19
- [PATCH 092/132] meson: convert hw/hyperv, Paolo Bonzini, 2019/12/19