From patchwork Wed Jun 6 06:36:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 163262 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 98DF2B6F62 for ; Wed, 6 Jun 2012 16:37:57 +1000 (EST) Received: from localhost ([::1]:54788 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9sR-0003zv-EM for incoming@patchwork.ozlabs.org; Wed, 06 Jun 2012 02:37:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9sH-0003zV-N8 for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sc9sC-0002K8-2z for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:45 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:45050) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sc9sB-00028S-R0 for qemu-devel@nongnu.org; Wed, 06 Jun 2012 02:37:40 -0400 Received: by mail-pz0-f45.google.com with SMTP id v2so9050407dad.4 for ; Tue, 05 Jun 2012 23:37:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=zyUQ+l0PQAbBPWzzus+oqGla/hJw2iTuMsdCfBaTxl0=; b=xZnh8llfJ6hxBz3Gp4y0N2FNLA6YPsFlffSxT2ifp9xW97DWBz4hZYfLZH8oBTAxKE 9meL0T8Ium4G9oGC4uUlJb5UL/1L7NBVmpD4EwAmTdS00zLGRC8rTUXICuvNQTsmENmq pSQ4yc/IIxuJHDY9AiTK6+bgQzk4gm8ZqyupoUZBYPhmCrHp2SCKb7RsYM0JuBLpBIxp TImaWz0mNmCDL9eoilTcNJTAXRVvX8Rd8nPq9KEixJFQpkK7/o6g9laAQCIgpXYYBotq 9p/ybJD0YE97ToE6Ie/FBdG7u+1TchRk1zUDrwBSM2RWBwKkK22RJVR6TD+b57EZbmYv 0yIg== Received: by 10.68.202.99 with SMTP id kh3mr54483455pbc.157.1338964658764; Tue, 05 Jun 2012 23:37:38 -0700 (PDT) Received: from yakj.usersys.redhat.com.usersys.redhat.com (p40081-ipngn402hodogaya.kanagawa.ocn.ne.jp. [180.23.161.81]) by mx.google.com with ESMTPS id py5sm1479093pbb.1.2012.06.05.23.37.35 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jun 2012 23:37:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 6 Jun 2012 08:36:30 +0200 Message-Id: <1338964592-22223-24-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1338964592-22223-1-git-send-email-pbonzini@redhat.com> References: <1338964592-22223-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Cc: anthony@codemonkey.ws Subject: [Qemu-devel] [PATCH v2 23/25] build: limit usage of vpath X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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 9728c46..cfbd265 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