From: Andreas Färber Date: Thu, 21 Feb 2013 15:26:46 +0000 (+0100) Subject: make_device_config.sh: Emit dependency file to directory where included X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~900^2~59^2~597^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=880708013357fa5d1c077e2a4a364b65706e09e7;p=sdk%2Femulator%2Fqemu.git 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 Signed-off-by: Blue Swirl --- diff --git a/Makefile b/Makefile index 2262410f0f..ae22a0f518 100644 --- 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_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=