aboutsummaryrefslogtreecommitdiff
path: root/Makefile.user
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2009-12-21 10:06:55 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2010-01-08 09:58:40 -0600
commit076d247142c1ff1e4d618557fc0acc62f6eb2a7c (patch)
tree91ba69a991591e278ba72675b17fd95bbfd091bf /Makefile.user
parente726fe7d60d46636c74c1c4a8fac7e4a05efb163 (diff)
Use vpath directive
The vpath directive has two advantages over the VPATH variable: 1) it allows to skip searching of .o files; 2) the default semantics are to append to the vpath, so there is no confusion between "VPATH=xyz" and "VPATH+=xyz". Since "vpath %.c %.h PATH" is not valid, I'm introducing a wrapper macro to append one or more directories to the vpath. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'Makefile.user')
-rw-r--r--Makefile.user6
1 files changed, 1 insertions, 5 deletions
diff --git a/Makefile.user b/Makefile.user
index c6ac50940a..024b7736b9 100644
--- a/Makefile.user
+++ b/Makefile.user
@@ -6,11 +6,7 @@ include $(SRC_PATH)/rules.mak
.PHONY: all
-# Do not take %.o from $(SRC_PATH), only %.c and %.h
-# All %.o for user targets should be built with -fpie, when
-# configured with --enable-user-pie, so we don't want to
-# take %.o from $(SRC_PATH), since they built without -fpie
-vpath %.c %.h $(SRC_PATH)
+$(call set-vpath, $(SRC_PATH))
QEMU_CFLAGS+=-I..