From patchwork Mon Jan 4 10:02:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 42056 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0FE68B6F08 for ; Mon, 4 Jan 2010 21:03:32 +1100 (EST) Received: from localhost ([127.0.0.1]:51049 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRjma-0001HK-UH for incoming@patchwork.ozlabs.org; Mon, 04 Jan 2010 05:03:28 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRjlq-0001H6-67 for qemu-devel@nongnu.org; Mon, 04 Jan 2010 05:02:42 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRjll-0001G5-T1 for qemu-devel@nongnu.org; Mon, 04 Jan 2010 05:02:41 -0500 Received: from [199.232.76.173] (port=50599 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRjll-0001G2-Np for qemu-devel@nongnu.org; Mon, 04 Jan 2010 05:02:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42655) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRjll-0007vQ-Ci for qemu-devel@nongnu.org; Mon, 04 Jan 2010 05:02:37 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o04A2WSQ004744 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 4 Jan 2010 05:02:35 -0500 Received: from localhost.localdomain (vpn2-11-57.ams2.redhat.com [10.36.11.57]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o04A2SC5001252; Mon, 4 Jan 2010 05:02:31 -0500 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Jan 2010 11:02:28 +0100 Message-Id: <1262599348-6238-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Juan Quintela Subject: [Qemu-devel] [PATCH] finish VPATH -> vpath translation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This adds a few more vpath suffixes and points the remaining two paths explicitly to $(SRC_PATH) in order to eliminate the VPATH assignment from config-host.mak. Signed-off-by: Paolo Bonzini Cc: Juan Quintela --- Makefile | 2 +- Makefile.target | 2 +- configure | 3 --- rules.mak | 3 ++- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 10c04a8..5c4e256 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ ifneq ($(wildcard config-host.mak),) all: build-all include config-host.mak include $(SRC_PATH)/rules.mak -config-host.mak: configure +config-host.mak: $(SRC_PATH)/configure @echo $@ is out-of-date, running configure @sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh else diff --git a/Makefile.target b/Makefile.target index edcd2e5..5999da7 100644 --- a/Makefile.target +++ b/Makefile.target @@ -316,7 +316,7 @@ $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(ARLIBS) $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)) -gdbstub-xml.c: $(TARGET_XML_FILES) feature_to_c.sh +gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/feature_to_c.sh $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@") qemu-options.h: $(SRC_PATH)/qemu-options.hx diff --git a/configure b/configure index 18aed43..b7c6519 100755 --- a/configure +++ b/configure @@ -2022,9 +2022,6 @@ qemu_version=`head $source_path/VERSION` echo "VERSION=$qemu_version" >>$config_host_mak echo "PKGVERSION=$pkgversion" >>$config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak -if [ "$source_path_used" = "yes" ]; then - echo "VPATH=$source_path" >> $config_host_mak -fi echo "TARGET_DIRS=$target_list" >> $config_host_mak if [ "$docs" = "yes" ] ; then echo "BUILD_DOCS=yes" >> $config_host_mak diff --git a/rules.mak b/rules.mak index 9cd67f0..82e8e3d 100644 --- a/rules.mak +++ b/rules.mak @@ -39,7 +39,8 @@ quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1)) cc-option = $(if $(shell $(CC) $1 $2 -S -o /dev/null -xc /dev/null \ >/dev/null 2>&1 && echo OK), $2, $3) -set-vpath = $(if $1,$(foreach PATTERN,%.c %.h %.S, $(eval vpath $(PATTERN) $1))) +VPATH_SUFFIXES = %.c %.h %.S %.m %.mak %.texi +set-vpath = $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES), $(eval vpath $(PATTERN) $1))) # Generate timestamp files for .h include files