On 27/04/2019 18.55, Philippe Mathieu-Daudé wrote: > Since we only require to link with acpi-stub.o when CONFIG_ACPI > is disabled, we can simplify the Makefile logic. > > Suggested-by: Paolo Bonzini <pbonz...@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > hw/acpi/Makefile.objs | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs > index 2d46e3789ae..c86edfbed90 100644 > --- a/hw/acpi/Makefile.objs > +++ b/hw/acpi/Makefile.objs > @@ -1,4 +1,3 @@ > -ifeq ($(CONFIG_ACPI),y) > common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o pcihp.o > common-obj-$(CONFIG_ACPI_X86_ICH) += ich9.o tco.o > common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o > @@ -6,16 +5,11 @@ common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o > common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o > common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o > common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o > -common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o > - > common-obj-y += acpi_interface.o > common-obj-y += bios-linker-loader.o > common-obj-y += aml-build.o
What about these three object files? We don't want to build them if CONFIG_ACPI is disabled, do we? Thomas > common-obj-$(CONFIG_TPM) += tpm.o > - > common-obj-$(CONFIG_IPMI) += ipmi.o > + > common-obj-$(call lnot,$(CONFIG_IPMI)) += ipmi-stub.o > -else > -common-obj-y += acpi-stub.o > -endif > -common-obj-$(CONFIG_ALL) += acpi-stub.o ipmi-stub.o > +common-obj-$(call lnot,$(CONFIG_ACPI)) += acpi-stub.o >
