From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NUMho-0004KF-04 for qemu-devel@nongnu.org; Mon, 11 Jan 2010 11:01:24 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NUMhj-0004Gi-49 for qemu-devel@nongnu.org; Mon, 11 Jan 2010 11:01:23 -0500 Received: from [199.232.76.173] (port=56656 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUMhi-0004Gd-Sc for qemu-devel@nongnu.org; Mon, 11 Jan 2010 11:01:18 -0500 Received: from e9.ny.us.ibm.com ([32.97.182.139]:33776) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NUMhi-0002rv-7Y for qemu-devel@nongnu.org; Mon, 11 Jan 2010 11:01:18 -0500 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by e9.ny.us.ibm.com (8.14.3/8.13.1) with ESMTP id o0BFrPP0028596 for ; Mon, 11 Jan 2010 10:53:25 -0500 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o0BG0jlg647342 for ; Mon, 11 Jan 2010 11:00:45 -0500 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o0BG0iGr022365 for ; Mon, 11 Jan 2010 11:00:44 -0500 Message-ID: <4B4B4B2B.3020304@linux.vnet.ibm.com> Date: Mon, 11 Jan 2010 10:00:43 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] finish VPATH -> vpath translation References: <1262599348-6238-1-git-send-email-pbonzini@redhat.com> In-Reply-To: <1262599348-6238-1-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org, Juan Quintela On 01/04/2010 04:02 AM, Paolo Bonzini wrote: > 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 > Applied. Thanks. Regards, Anthony Liguori > 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 > >