summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorAndreas Färber2013-02-21 16:26:46 +0100
committerBlue Swirl2013-03-09 13:00:03 +0100
commit880708013357fa5d1c077e2a4a364b65706e09e7 (patch)
tree7fa4915cbc7735a33eb23a0c19336b12c59c90eb /Makefile
parentRevert "make_device_config.sh: Fix target path in generated dependency file" (diff)
downloadqemu-880708013357fa5d1c077e2a4a364b65706e09e7.tar.gz
qemu-880708013357fa5d1c077e2a4a364b65706e09e7.tar.xz
qemu-880708013357fa5d1c077e2a4a364b65706e09e7.zip
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
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: