From bb768f71eb504ebce4b12bcf61675a0ad9a81fdf Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Fri, 10 May 2019 10:11:59 +0200 Subject: Makefile: Fix inclusion of the config-devices.mak.d Kconfig dependencies The Makefile tries to include device Kconfig dependencies via -include $(SUBDIR_DEVICES_MAK_DEP) and thus expects files that match *-softmmu/config-devices.mak.d ... however, the minikconf script currently generates files a la "*-softmmu-config.devices.mak.d" instead, so the dependency files simply got ignored so far. For example, after a "touch hw/arm/Kconfig", the arm-softmmu/config-devices.mak file is currently not re-generated. Fix it by putting the dependency files in the *-softmmu folders now. Reported-by: Peter Maydell Signed-off-by: Thomas Huth --- docs/devel/kconfig.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst index cce146f87d..d6f8eb0977 100644 --- a/docs/devel/kconfig.rst +++ b/docs/devel/kconfig.rst @@ -299,7 +299,7 @@ and also listed as follows in the top-level Makefile's ``MINIKCONF_ARGS`` variable:: MINIKCONF_ARGS = \ - $@ $*-config.devices.mak.d $< $(MINIKCONF_INPUTS) \ + $@ $*/config-devices.mak.d $< $(MINIKCONF_INPUTS) \ CONFIG_KVM=$(CONFIG_KVM) \ CONFIG_SPICE=$(CONFIG_SPICE) \ CONFIG_TPM=$(CONFIG_TPM) \ -- cgit v1.2.3