Skip to content
Browse files

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>
  • Loading branch information...
1 parent 1b30481 commit 880708013357fa5d1c077e2a4a364b65706e09e7 @afaerber committed with blueswirl Feb 21, 2013
Showing with 2 additions and 2 deletions.
  1. +1 −1 Makefile
  2. +1 −1 scripts/make_device_config.sh
View
2 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_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:
View
2 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=

0 comments on commit 8807080

Please sign in to comment.
Something went wrong with that request. Please try again.