aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-02-21 16:26:47 +0100
committerBlue Swirl <blauwirbel@gmail.com>2013-03-09 12:00:03 +0000
commit916359f66f838481b4a37a45ab27ccd0474ae487 (patch)
tree96057f86a71cb988b37d05d58e0f074077e8a726
parent880708013357fa5d1c077e2a4a364b65706e09e7 (diff)
Makefile: Add subdir dependency on config-devices-all.mak
What 23bf49b5eca716aaad073f2b47613434e1515cb5 really seemed to try to fix is that Makefile could recurse into *-softmmu/ subdirectories before a new *-softmmu/config-devices.mak was generated from pci.mak. Fix this by adding a dependency on config-all-devices.mak, which in turn has dependencies on *-softmmu/config-devices.mak. Reported-by: Gerhard Wiesinger <lists@wiesinger.com> Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ae22a0f518..12c7662667 100644
--- a/Makefile
+++ b/Makefile
@@ -123,6 +123,9 @@ qemu-options.def: $(SRC_PATH)/qemu-options.hx
$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@")
SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
+SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES))
+
+$(SOFTMMU_SUBDIR_RULES): config-all-devices.mak
subdir-%:
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" all,)