diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-02-21 16:26:46 +0100 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2013-03-09 12:00:03 +0000 |
| commit | 880708013357fa5d1c077e2a4a364b65706e09e7 (patch) | |
| tree | 7fa4915cbc7735a33eb23a0c19336b12c59c90eb | |
| parent | 1b3048170ad0dad83186a39cbf22471fc32583ea (diff) | |
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>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | scripts/make_device_config.sh | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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: diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh index 28efd36286..7242707819 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= |