aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2010-01-04 11:02:28 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2010-01-08 10:43:19 -0600
commit95e74c70c4b436582a6eb4c7d7d49583389ec339 (patch)
tree198f2227335286b959128e93a0ee75c2ecb2133e
parent52001445c9d9e9191c1d9b2f887cd9ae265f0799 (diff)
downloadqemu-staging.tar.gz
qemu-staging.tar.xz
qemu-staging.zip
finish VPATH -> vpath translationstaging
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> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--Makefile2
-rw-r--r--Makefile.target2
-rwxr-xr-xconfigure3
-rw-r--r--rules.mak3
4 files changed, 4 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 20c4e56e2..b87638f7d 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,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 c213a6dd6..e6614789c 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -333,7 +333,7 @@ $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
$(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 1e9dd0484..5c056f51b 100755
--- a/configure
+++ b/configure
@@ -1991,9 +1991,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 094dc0924..5941b73eb 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