diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-05-29 11:49:50 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-06-07 09:21:18 +0200 |
| commit | fec90ff0bd522a65beb330ab5ca45a40b2f14f10 (patch) | |
| tree | 89571607a3369ef30aa1bf04f26436635c5e1a4c | |
| parent | 00c705fb92bc6e69e955aeac3614e05ca02feacd (diff) | |
| download | qemu-fec90ff0bd522a65beb330ab5ca45a40b2f14f10.zip qemu-fec90ff0bd522a65beb330ab5ca45a40b2f14f10.tar.gz qemu-fec90ff0bd522a65beb330ab5ca45a40b2f14f10.tar.bz2 | |
build: limit usage of vpath
All paths are now explicitly given, and the object tree mimics
the source tree, so there is no need to apply special vpaths.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.target | 5 |
2 files changed, 3 insertions, 4 deletions
@@ -33,7 +33,7 @@ configure: ; .PHONY: all clean cscope distclean dvi html info install install-doc \ pdf recurse-all speed tar tarbin test build-all -$(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw) +$(call set-vpath, $(SRC_PATH)) LIBS+=-lz $(LIBS_TOOLS) diff --git a/Makefile.target b/Makefile.target index 555894d..2907aad 100644 --- a/Makefile.target +++ b/Makefile.target @@ -8,12 +8,11 @@ ifneq ($(HWDIR),) include $(HWDIR)/config.mak endif -TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH) -$(call set-vpath, $(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw) +$(call set-vpath, $(SRC_PATH)) ifdef CONFIG_LINUX QEMU_CFLAGS += -I../linux-headers endif -QEMU_CFLAGS += -I.. -I$(TARGET_PATH) -DNEED_CPU_H +QEMU_CFLAGS += -I.. -I$(SRC_PATH)/target-$(TARGET_BASE_ARCH) -DNEED_CPU_H QEMU_CFLAGS+=-I$(SRC_PATH)/include |