aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorFam Zheng <famz@redhat.com>2016-06-01 12:25:16 +0800
committerFam Zheng <famz@redhat.com>2016-06-01 17:25:50 +0800
commitfb57c881022ebbf4ad5fdb688360985d11521b4a (patch)
tree4116e49215a37076e4da930d44119dbb00061298 /Makefile
parent2f4e4dc237261c76734d8ae1d8e09d2983d2f1ca (diff)
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 <famz@redhat.com> Message-id: 1464755128-32490-4-git-send-email-famz@redhat.com
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3a3c5dc647..1c2a7bde13 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