Received: from eggs.gnu.org ([209.51.188.92]:37261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKQeU-0008IV-0s for qemu-devel@nongnu.org; Sat, 27 Apr 2019 12:58:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKQbk-00075v-Gy for qemu-devel@nongnu.org; Sat, 27 Apr 2019 12:55:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46720) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hKQbi-00073P-Jz for qemu-devel@nongnu.org; Sat, 27 Apr 2019 12:55:22 -0400 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Sat, 27 Apr 2019 18:55:03 +0200 Message-Id: <20190427165504.29846-2-philmd@redhat.com> In-Reply-To: <20190427165504.29846-1-philmd@redhat.com> References: <20190427165504.29846-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 1/2] hw/acpi: Simplify the Makefile logic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , David Gibson , Samuel Ortiz , Aleksandar Rikalo , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , Yang Zhong , Thomas Huth , Paolo Bonzini , Aurelien Jarno , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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) +=3D core.o piix4.o pcihp.o common-obj-$(CONFIG_ACPI_X86_ICH) +=3D ich9.o tco.o common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) +=3D cpu_hotplug.o @@ -6,16 +5,11 @@ common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) +=3D memory_ho= tplug.o common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) +=3D cpu.o common-obj-$(CONFIG_ACPI_NVDIMM) +=3D nvdimm.o common-obj-$(CONFIG_ACPI_VMGENID) +=3D vmgenid.o -common-obj-$(call lnot,$(CONFIG_ACPI_X86)) +=3D acpi-stub.o - common-obj-y +=3D acpi_interface.o common-obj-y +=3D bios-linker-loader.o common-obj-y +=3D aml-build.o common-obj-$(CONFIG_TPM) +=3D tpm.o - common-obj-$(CONFIG_IPMI) +=3D ipmi.o + common-obj-$(call lnot,$(CONFIG_IPMI)) +=3D ipmi-stub.o -else -common-obj-y +=3D acpi-stub.o -endif -common-obj-$(CONFIG_ALL) +=3D acpi-stub.o ipmi-stub.o +common-obj-$(call lnot,$(CONFIG_ACPI)) +=3D acpi-stub.o --=20 2.20.1