[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 03/15] Makefile: Always include rules.mak
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v7 03/15] Makefile: Always include rules.mak |
Date: |
Wed, 1 Jun 2016 12:25:16 +0800 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH v7 00/15] tests: Introducing docker tests, Fam Zheng, 2016/06/01
- [Qemu-devel] [PATCH v7 01/15] tests: Add utilities for docker testing, Fam Zheng, 2016/06/01
- [Qemu-devel] [PATCH v7 02/15] rules.mak: Add "COMMA" constant, Fam Zheng, 2016/06/01
- [Qemu-devel] [PATCH v7 03/15] Makefile: Always include rules.mak,
Fam Zheng <=
- [Qemu-devel] [PATCH v7 05/15] docker: Add images, Fam Zheng, 2016/06/01
- [Qemu-devel] [PATCH v7 06/15] docker: Add test runner, Fam Zheng, 2016/06/01
- [Qemu-devel] [PATCH v7 04/15] Makefile: Rules for docker testing, Fam Zheng, 2016/06/01
- [Qemu-devel] [PATCH v7 07/15] docker: Add common.rc, Fam Zheng, 2016/06/01
- [Qemu-devel] [PATCH v7 08/15] docker: Add quick test, Fam Zheng, 2016/06/01
- [Qemu-devel] [PATCH v7 11/15] docker: Add mingw test, Fam Zheng, 2016/06/01
- [Qemu-devel] [PATCH v7 10/15] docker: Add clang test, Fam Zheng, 2016/06/01