Commit fec90ff0 authored May 29, 2012 by Paolo Bonzini

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>

parent 00c705fb

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

Makefile.target

+2 −3

Original line number	Diff line number	Diff line
		@@ -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