[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 073/142] meson: convert hw/smbios
From: |
Paolo Bonzini |
Subject: |
[PATCH 073/142] meson: convert hw/smbios |
Date: |
Tue, 28 Jan 2020 18:52:33 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/smbios/Makefile.objs | 10 ----------
hw/smbios/meson.build | 13 +++++++++++++
4 files changed, 14 insertions(+), 11 deletions(-)
delete mode 100644 hw/smbios/Makefile.objs
create mode 100644 hw/smbios/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 29c4aa20b7..546da511a6 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -35,7 +35,6 @@ devices-dirs-$(CONFIG_VFIO) += vfio/
devices-dirs-y += virtio/
devices-dirs-y += watchdog/
devices-dirs-$(CONFIG_MEM_DEVICE) += mem/
-devices-dirs-y += smbios/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index 03ef30212e..dccc2d19a6 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
subdir('nubus')
subdir('semihosting')
+subdir('smbios')
subdir('xen')
diff --git a/hw/smbios/Makefile.objs b/hw/smbios/Makefile.objs
deleted file mode 100644
index 23bb2bac07..0000000000
--- a/hw/smbios/Makefile.objs
+++ /dev/null
@@ -1,10 +0,0 @@
-ifeq ($(CONFIG_SMBIOS),y)
-common-obj-y += smbios.o
-common-obj-$(CONFIG_IPMI) += smbios_type_38.o
-common-obj-$(call lnot,$(CONFIG_IPMI)) += smbios_type_38-stub.o
-else
-common-obj-y += smbios-stub.o
-endif
-
-common-obj-$(CONFIG_ALL) += smbios-stub.o
-common-obj-$(CONFIG_ALL) += smbios_type_38-stub.o
diff --git a/hw/smbios/meson.build b/hw/smbios/meson.build
new file mode 100644
index 0000000000..9e762c7108
--- /dev/null
+++ b/hw/smbios/meson.build
@@ -0,0 +1,13 @@
+smbios_ss = ss.source_set()
+smbios_ss.add(files('smbios.c'))
+smbios_ss.add(when: 'CONFIG_IPMI',
+ if_true: files('smbios_type_38.c'),
+ if_false: files('smbios_type_38-stub.c'))
+
+softmmu_ss.add_all(when: 'CONFIG_SMBIOS', if_true: smbios_ss)
+softmmu_ss.add(when: 'CONFIG_SMBIOS', if_false: files('smbios-stub.c'))
+
+softmmu_ss.add(when: 'CONFIG_ALL', if_true: files(
+ 'smbios-stub.c',
+ 'smbios_type_38-stub.c',
+))
--
2.21.0
- [PATCH 063/142] meson: build softmmu-specific migration/ram.c, (continued)
- [PATCH 063/142] meson: build softmmu-specific migration/ram.c, Paolo Bonzini, 2020/01/28
- [PATCH 064/142] meson: convert net directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 065/142] meson: convert backends directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 067/142] meson: convert disas directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 066/142] meson: convert fsdev/, Paolo Bonzini, 2020/01/28
- [PATCH 068/142] meson: convert qapi-specific to meson, Paolo Bonzini, 2020/01/28
- [PATCH 069/142] meson: convert hw/xen, Paolo Bonzini, 2020/01/28
- [PATCH 070/142] meson: convert hw/core, Paolo Bonzini, 2020/01/28
- [PATCH 071/142] meson: convert hw/semihosting, Paolo Bonzini, 2020/01/28
- [PATCH 072/142] meson: convert hw/nubus, Paolo Bonzini, 2020/01/28
- [PATCH 073/142] meson: convert hw/smbios,
Paolo Bonzini <=
- [PATCH 074/142] meson: convert hw/mem, Paolo Bonzini, 2020/01/28
- [PATCH 075/142] meson: convert hw/watchdog, Paolo Bonzini, 2020/01/28
- [PATCH 076/142] meson: convert hw/virtio, Paolo Bonzini, 2020/01/28
- [PATCH 078/142] meson: convert hw/usb, Paolo Bonzini, 2020/01/28
- [PATCH 079/142] meson: convert hw/tpm, Paolo Bonzini, 2020/01/28
- [PATCH 077/142] meson: convert hw/vfio, Paolo Bonzini, 2020/01/28
- [PATCH 080/142] meson: convert hw/timer, Paolo Bonzini, 2020/01/28
- [PATCH 081/142] meson: convert hw/rtc, Paolo Bonzini, 2020/01/28
- [PATCH 082/142] meson: convert hw/ssi, Paolo Bonzini, 2020/01/28
- [PATCH 083/142] meson: convert hw/sd, Paolo Bonzini, 2020/01/28