From 1b3048170ad0dad83186a39cbf22471fc32583ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 21 Feb 2013 16:26:45 +0100 Subject: Revert "make_device_config.sh: Fix target path in generated dependency file" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 23bf49b5eca716aaad073f2b47613434e1515cb5. While *-softmmu/config-devices.mak.d is included through *.d pattern via Makefile.target, the make_devices_config.sh call these dependencies are for is in ./Makefile. Therefore revert to original behavior. This should unbreak pci.mak dependencies not propagating. Reported-by: Peter Maydell Signed-off-by: Andreas Färber Signed-off-by: Blue Swirl --- scripts/make_device_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh index 81fe942..28efd36 100644 --- a/scripts/make_device_config.sh +++ b/scripts/make_device_config.sh @@ -25,4 +25,4 @@ done process_includes $src > $dest cat $src $all_includes | grep -v '^include' > $dest -echo "`basename $1`: $all_includes" > $dep +echo "$1: $all_includes" > $dep -- cgit v1.1 From 880708013357fa5d1c077e2a4a364b65706e09e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 21 Feb 2013 16:26:46 +0100 Subject: make_device_config.sh: Emit dependency file to directory where included MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Placing the config-devices.mak.d file alongside the config-devices.mak file in *-softmmu/ lead to it getting included into through *-softmmu/Makefile in addition to ./Makefile, leading to confusion. Instead, emit it to ./%-config-devices.mak.d, where it is included. Signed-off-by: Andreas Färber Signed-off-by: Blue Swirl --- scripts/make_device_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh index 28efd36..7242707 100644 --- a/scripts/make_device_config.sh +++ b/scripts/make_device_config.sh @@ -3,7 +3,7 @@ # files from include directives. dest=$1.tmp -dep=$1.d +dep=`dirname $1`-`basename $1`.d src=$2 src_dir=`dirname $src` all_includes= -- cgit v1.1