Patchwork finish VPATH -> vpath translation

login
register
mail settings
Submitter Paolo Bonzini
Date Jan. 4, 2010, 10:02 a.m.
Message ID <1262599348-6238-1-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/42056/
State New
Headers show

Comments

Paolo Bonzini - Jan. 4, 2010, 10:02 a.m.
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 <pbonzini@redhat.com>
Cc: Juan Quintela <quintela@redhat.com>
---
 Makefile        |    2 +-
 Makefile.target |    2 +-
 configure       |    3 ---
 rules.mak       |    3 ++-
 4 files changed, 4 insertions(+), 6 deletions(-)
Anthony Liguori - Jan. 11, 2010, 4 p.m.
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<pbonzini@redhat.com>
>    

Applied.  Thanks.

Regards,

Anthony Liguori

> Cc: Juan Quintela<quintela@redhat.com>
> ---
>   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
>
>

Patch

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