make_device_config.sh: Emit dependency file to directory where included

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 <afaerber@suse.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

diff --git a/Makefile b/Makefile
index 2262410f0fe42915b0c0402b166e3a95b137497b..ae22a0f51866b61e136b782d5cad281d216cbc32 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ endif
 
 SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory) BUILD_DIR=$(BUILD_DIR)
 SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
 
 SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory) BUILD_DIR=$(BUILD_DIR)
 SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))

-SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %/config-devices.mak.d, $(TARGET_DIRS))
+SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS))

 
 ifeq ($(SUBDIR_DEVICES_MAK),)
 config-all-devices.mak:
 
 ifeq ($(SUBDIR_DEVICES_MAK),)
 config-all-devices.mak:

diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
index 28efd36286453d17eca1c2682b43970336bdf808..7242707819458032839155ce77a439b4d0b54c73 100644 (file)
--- a/scripts/make_device_config.sh
+++ b/scripts/make_device_config.sh
@@ -3,7 +3,7 @@
 # files from include directives.
 
 dest=$1.tmp
 # files from include directives.
 
 dest=$1.tmp

-dep=$1.d
+dep=`dirname $1`-`basename $1`.d

 src=$2
 src_dir=`dirname $src`
 all_includes=
 src=$2
 src_dir=`dirname $src`
 all_includes=