Patchwork [3/3] Makefile: Add subdir dependency on config-devices-all.mak

login
register
mail settings
Submitter Andreas Färber
Date Feb. 21, 2013, 3:26 p.m.
Message ID <1361460407-8493-4-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/222332/
State New
Headers show

Comments

Andreas Färber - Feb. 21, 2013, 3:26 p.m.
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>
---
 Makefile |    3 +++
 1 Datei geändert, 3 Zeilen hinzugefügt(+)

Patch

diff --git a/Makefile b/Makefile
index 0ece051..a8d883c 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,)