From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Fam Zheng <famz@redhat.com>, alex.bennee@linaro.org, pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH v7 03/15] Makefile: Always include rules.mak
Date: Wed, 1 Jun 2016 12:25:16 +0800 [thread overview]
Message-ID: <1464755128-32490-4-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1464755128-32490-1-git-send-email-famz@redhat.com>
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>
---
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
next prev parent reply other threads:[~2016-06-01 4:25 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-01 4:25 [Qemu-devel] [PATCH v7 00/15] tests: Introducing docker tests Fam Zheng
2016-06-01 4:25 ` [Qemu-devel] [PATCH v7 01/15] tests: Add utilities for docker testing Fam Zheng
2016-06-01 4:25 ` [Qemu-devel] [PATCH v7 02/15] rules.mak: Add "COMMA" constant Fam Zheng
2016-06-01 4:25 ` Fam Zheng [this message]
2016-06-01 4:25 ` [Qemu-devel] [PATCH v7 04/15] Makefile: Rules for docker testing Fam Zheng
2016-06-01 8:17 ` Paolo Bonzini
2016-06-01 8:18 ` Paolo Bonzini
2016-06-01 8:59 ` Fam Zheng
2016-06-01 4:25 ` [Qemu-devel] [PATCH v7 05/15] docker: Add images Fam Zheng
2016-06-01 4:25 ` [Qemu-devel] [PATCH v7 06/15] docker: Add test runner Fam Zheng
2016-06-01 4:25 ` [Qemu-devel] [PATCH v7 07/15] docker: Add common.rc Fam Zheng
2016-06-01 4:25 ` [Qemu-devel] [PATCH v7 08/15] docker: Add quick test Fam Zheng
2016-06-01 4:25 ` [Qemu-devel] [PATCH v7 09/15] docker: Add full test Fam Zheng
2016-06-01 4:25 ` [Qemu-devel] [PATCH v7 10/15] docker: Add clang test Fam Zheng
2016-06-01 4:25 ` [Qemu-devel] [PATCH v7 11/15] docker: Add mingw test Fam Zheng
2016-06-01 4:25 ` [Qemu-devel] [PATCH v7 12/15] docker: Add travis tool Fam Zheng
2016-06-01 4:25 ` [Qemu-devel] [PATCH v7 13/15] docs: Add text for tests/docker in build-system.txt Fam Zheng
2016-06-01 4:25 ` [Qemu-devel] [PATCH v7 14/15] docker: Add EXTRA_CONFIGURE_OPTS Fam Zheng
2016-06-01 4:25 ` [Qemu-devel] [PATCH v7 15/15] MAINTAINERS: Add tests/docker Fam Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464755128-32490-4-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.