| Message ID | 1596741379-12902-107-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Meson integration for 5.2 | expand |
On Thu, Aug 06, 2020 at 09:15:42PM +0200, Paolo Bonzini wrote: > 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> I looked at all the configure names and files and everything looks correct. Reviewed-by: Corey Minyard <cminyard@mvista.com> > --- > hw/Makefile.objs | 1 - > hw/ipmi/Makefile.objs | 8 -------- > hw/ipmi/meson.build | 11 +++++++++++ > hw/meson.build | 1 + > 4 files changed, 12 insertions(+), 9 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 a28e211..f136377 100644 > --- a/hw/Makefile.objs > +++ b/hw/Makefile.objs > @@ -15,7 +15,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 3cca10b..0000000 > --- a/hw/ipmi/Makefile.objs > +++ /dev/null > @@ -1,8 +0,0 @@ > -common-obj-$(CONFIG_IPMI) += ipmi.o ipmi_kcs.o ipmi_bt.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_PCI_IPMI_KCS) += pci_ipmi_kcs.o > -common-obj-$(CONFIG_ISA_IPMI_BT) += isa_ipmi_bt.o > -common-obj-$(CONFIG_PCI_IPMI_BT) += pci_ipmi_bt.o > -common-obj-$(CONFIG_IPMI_SSIF) += smbus_ipmi.o > diff --git a/hw/ipmi/meson.build b/hw/ipmi/meson.build > new file mode 100644 > index 0000000..9622ea2 > --- /dev/null > +++ b/hw/ipmi/meson.build > @@ -0,0 +1,11 @@ > +ipmi_ss = ss.source_set() > +ipmi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c', 'ipmi_kcs.c', 'ipmi_bt.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_PCI_IPMI_KCS', if_true: files('pci_ipmi_kcs.c')) > +ipmi_ss.add(when: 'CONFIG_ISA_IPMI_BT', if_true: files('isa_ipmi_bt.c')) > +ipmi_ss.add(when: 'CONFIG_PCI_IPMI_BT', if_true: files('pci_ipmi_bt.c')) > +ipmi_ss.add(when: 'CONFIG_IPMI_SSIF', if_true: files('smbus_ipmi.c')) > + > +softmmu_ss.add_all(when: 'CONFIG_IPMI', if_true: ipmi_ss) > diff --git a/hw/meson.build b/hw/meson.build > index 8659854..9796f95 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 > > >
diff --git a/hw/Makefile.objs b/hw/Makefile.objs index a28e211..f136377 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -15,7 +15,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 3cca10b..0000000 --- a/hw/ipmi/Makefile.objs +++ /dev/null @@ -1,8 +0,0 @@ -common-obj-$(CONFIG_IPMI) += ipmi.o ipmi_kcs.o ipmi_bt.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_PCI_IPMI_KCS) += pci_ipmi_kcs.o -common-obj-$(CONFIG_ISA_IPMI_BT) += isa_ipmi_bt.o -common-obj-$(CONFIG_PCI_IPMI_BT) += pci_ipmi_bt.o -common-obj-$(CONFIG_IPMI_SSIF) += smbus_ipmi.o diff --git a/hw/ipmi/meson.build b/hw/ipmi/meson.build new file mode 100644 index 0000000..9622ea2 --- /dev/null +++ b/hw/ipmi/meson.build @@ -0,0 +1,11 @@ +ipmi_ss = ss.source_set() +ipmi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c', 'ipmi_kcs.c', 'ipmi_bt.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_PCI_IPMI_KCS', if_true: files('pci_ipmi_kcs.c')) +ipmi_ss.add(when: 'CONFIG_ISA_IPMI_BT', if_true: files('isa_ipmi_bt.c')) +ipmi_ss.add(when: 'CONFIG_PCI_IPMI_BT', if_true: files('pci_ipmi_bt.c')) +ipmi_ss.add(when: 'CONFIG_IPMI_SSIF', if_true: files('smbus_ipmi.c')) + +softmmu_ss.add_all(when: 'CONFIG_IPMI', if_true: ipmi_ss) diff --git a/hw/meson.build b/hw/meson.build index 8659854..9796f95 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('ipmi') subdir('isa') subdir('mem') subdir('misc')