[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/3] make_device_config.sh: Emit dependency file to
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 2/3] make_device_config.sh: Emit dependency file to directory where included |
Date: |
Thu, 21 Feb 2013 16:26:46 +0100 |
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 <address@hidden>
---
Makefile | 2 +-
scripts/make_device_config.sh | 2 +-
2 Dateien geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
diff --git a/Makefile b/Makefile
index 0d9099a..0ece051 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 5d14885..26e9077 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=
--
1.7.10.4