Patchwork Makefile: Exclude tests/Makefile in unconfigured tree

login
register
mail settings
Submitter Andreas Färber
Date Jan. 17, 2012, 12:16 p.m.
Message ID <1326802565-12770-1-git-send-email-andreas.faerber@web.de>
Download mbox | patch
Permalink /patch/136453/
State New
Headers show

Comments

Andreas Färber - Jan. 17, 2012, 12:16 p.m.
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>
---
 Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Patch

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