From: Fam Zheng Date: Wed, 1 Jun 2016 04:25:16 +0000 (+0800) Subject: Makefile: Always include rules.mak X-Git-Tag: TizenStudio_2.0_p4.0~6^2~12^2~6^2~241^2~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb57c881022ebbf4ad5fdb688360985d11521b4a;p=sdk%2Femulator%2Fqemu.git Makefile: Always include rules.mak 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 --- 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