[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 26/29] build: limit usage of vpath
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 26/29] build: limit usage of vpath |
Date: |
Thu, 7 Jun 2012 09:40:11 +0200 |
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 <address@hidden>
---
Makefile | 2 +-
Makefile.target | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 1d34b95..32550cb 100644
--- a/Makefile
+++ b/Makefile
@@ -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
--
1.7.10.1
- Re: [Qemu-devel] [PATCH v3 06/29] build: move libobj-y variable to nested Makefile.objs, (continued)
[Qemu-devel] [PATCH v3 10/29] build: move other target-*/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
[Qemu-devel] [PATCH v3 11/29] build: move rules for nesting to Makefile.objs, Paolo Bonzini, 2012/06/07
[Qemu-devel] [PATCH v3 13/29] build: move block/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
[Qemu-devel] [PATCH v3 12/29] build: adapt qom/Makefile and move it to Makefile.objs, Paolo Bonzini, 2012/06/07
[Qemu-devel] [PATCH v3 14/29] build: move net/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
[Qemu-devel] [PATCH v3 21/29] build: move target-independent hw/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
[Qemu-devel] [PATCH v3 25/29] build: libcacard Makefile cleanups, Paolo Bonzini, 2012/06/07
[Qemu-devel] [PATCH v3 26/29] build: limit usage of vpath,
Paolo Bonzini <=
[Qemu-devel] [PATCH v3 28/29] configure: ensure directory exists when creating symlink, Paolo Bonzini, 2012/06/07
[Qemu-devel] [PATCH v3 15/29] build: move fsdev/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
[Qemu-devel] [PATCH v3 07/29] dump: do not compile dump.o for user-mode emulation, Paolo Bonzini, 2012/06/07
[Qemu-devel] [PATCH v3 29/29] build: do not create directories at configure time, Paolo Bonzini, 2012/06/07
[Qemu-devel] [PATCH v3 09/29] dump: remove dumping stuff from cpu-all.h, Paolo Bonzini, 2012/06/07
[Qemu-devel] [PATCH v3 23/29] build: move per-target hw/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
[Qemu-devel] [PATCH v3 20/29] build: move qga/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
[Qemu-devel] [PATCH v3 27/29] build: compile oslib-obj-y once, Paolo Bonzini, 2012/06/07
[Qemu-devel] [PATCH v3 08/29] dump: change cpu_get_note_size to return ssize_t, Paolo Bonzini, 2012/06/07