From patchwork Thu Feb 21 15:26:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [3/3] Makefile: Add subdir dependency on config-devices-all.mak Date: Thu, 21 Feb 2013 05:26:47 -0000 From: =?utf-8?q?Andreas_F=C3=A4rber_=3Cafaerber=40suse=2Ede=3E?= X-Patchwork-Id: 222332 Message-Id: <1361460407-8493-4-git-send-email-afaerber@suse.de> To: qemu-devel@nongnu.org Cc: Peter Maydell , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= 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 Signed-off-by: Andreas Färber --- Makefile | 3 +++ 1 Datei geändert, 3 Zeilen hinzugefügt(+) 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,)