From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: "Andreas Färber" <andreas.faerber@web.de>,
qemu-devel@nongnu.org,
"Stefan Hajnoczi" <stefanha@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH 4/5] Makefile: Exclude tests/Makefile in unconfigured tree
Date: Thu, 19 Jan 2012 10:32:06 +0000 [thread overview]
Message-ID: <1326969127-22458-5-git-send-email-stefanha@linux.vnet.ibm.com> (raw)
In-Reply-To: <1326969127-22458-1-git-send-email-stefanha@linux.vnet.ibm.com>
From: Andreas Färber <andreas.faerber@web.de>
Since commit dbfe06c62ccedc5b64e1c6466445133dd50f6de1 (build:
split unit test builds to a separate makefile fragment),
in absence of config-host.mak an undefined $(SRC_PATH) breaks
`make distclean' due to /tests/Makefile not being include'able.
Fix by only including when config-host.mak is present.
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Cc: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
Makefile | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index 2bbc547..d356f07 100644
--- a/Makefile
+++ b/Makefile
@@ -168,7 +168,9 @@ qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
gen-out-type = $(subst .,-,$(suffix $@))
+ifneq ($(wildcard config-host.mak),)
include $(SRC_PATH)/tests/Makefile
+endif
$(qapi-dir)/qga-qapi-types.c $(qapi-dir)/qga-qapi-types.h :\
$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-types.py
--
1.7.8.3
next prev parent reply other threads:[~2012-01-19 10:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-19 10:32 [Qemu-devel] [PULL 0/5] Trivial patches for 14 to 19 January 2012 Stefan Hajnoczi
2012-01-19 10:32 ` [Qemu-devel] [PATCH 1/5] qemu-tool: Fix mixup of int64 and int64_t Stefan Hajnoczi
2012-01-19 10:32 ` [Qemu-devel] [PATCH 2/5] tests: Silence gtester in Makefile Stefan Hajnoczi
2012-01-19 10:32 ` [Qemu-devel] [PATCH 3/5] lm32: Fix mixup of uint32 and uint32_t Stefan Hajnoczi
2012-01-19 10:32 ` Stefan Hajnoczi [this message]
2012-01-19 10:32 ` [Qemu-devel] [PATCH 5/5] Makefile: Remove generated headers on clean Stefan Hajnoczi
2012-01-19 18:47 ` [Qemu-devel] [PULL 0/5] Trivial patches for 14 to 19 January 2012 Anthony Liguori
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=1326969127-22458-5-git-send-email-stefanha@linux.vnet.ibm.com \
--to=stefanha@linux.vnet.ibm.com \
--cc=aliguori@us.ibm.com \
--cc=andreas.faerber@web.de \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).