Simplify the Makefile logic to ease further modifications/reviews. Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> --- hw/acpi/Makefile.objs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs index 73eca4f7dff..b5515c626a6 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,10 +5,8 @@ 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-y += acpi_interface.o -common-obj-y += bios-linker-loader.o -common-obj-y += aml-build.o -common-obj-$(CONFIG_TPM) += tpm.o -common-obj-$(CONFIG_IPMI) += ipmi.o -endif +common-obj-$(CONFIG_ACPI) += acpi_interface.o +common-obj-$(CONFIG_ACPI) += bios-linker-loader.o +common-obj-$(CONFIG_ACPI) += aml-build.o +common-obj-$(call land,$(CONFIG_ACPI),$(CONFIG_TPM)) += tpm.o +common-obj-$(call land,$(CONFIG_ACPI),$(CONFIG_IPMI)) += ipmi.o -- 2.20.1
