From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b82ij-0005HG-Lb for qemu-devel@nongnu.org; Wed, 01 Jun 2016 05:45:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b82ih-0007QJ-PG for qemu-devel@nongnu.org; Wed, 01 Jun 2016 05:45:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38650) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b82ih-0007QB-Ju for qemu-devel@nongnu.org; Wed, 01 Jun 2016 05:45:47 -0400 From: Fam Zheng Date: Wed, 1 Jun 2016 17:45:11 +0800 Message-Id: <1464774324-886-4-git-send-email-famz@redhat.com> In-Reply-To: <1464774324-886-1-git-send-email-famz@redhat.com> References: <1464774324-886-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PULL 03/16] Makefile: Always include rules.mak List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: qemu-devel@nongnu.org When config-host.mak is not found it is safe to assume SRC_PATH is ".". So, it is okay to move inclusion of ruls.mak out of the ifeq condition. Signed-off-by: Fam Zheng Message-id: 1464755128-32490-4-git-send-email-famz@redhat.com --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3a3c5dc..1c2a7bd 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,6 @@ CONFIG_ALL=y -include config-all-devices.mak -include config-all-disas.mak -include $(SRC_PATH)/rules.mak config-host.mak: $(SRC_PATH)/configure @echo $@ is out-of-date, running configure @# TODO: The next lines include code which supports a smooth @@ -49,6 +48,8 @@ ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fa endif endif +include $(SRC_PATH)/rules.mak + GENERATED_HEADERS = config-host.h qemu-options.def GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h qapi-event.h GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c qapi-event.c -- 2.8.2