diff options
| author | Thomas Huth <thuth@redhat.com> | 2019-05-10 10:11:59 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2019-05-13 09:36:31 +0200 |
| commit | bb768f71eb504ebce4b12bcf61675a0ad9a81fdf (patch) | |
| tree | 9738d6ccd47d77b808a5b49561b66517b34c8959 | |
| parent | d9e36515a1c4de1361d860141ff1dea41a9efaad (diff) | |
| download | focaccia-qemu-bb768f71eb504ebce4b12bcf61675a0ad9a81fdf.tar.gz focaccia-qemu-bb768f71eb504ebce4b12bcf61675a0ad9a81fdf.zip | |
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 <peter.maydell@linaro.org> Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | docs/devel/kconfig.rst | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile index 4a8ae0ef95..66d5c65156 100644 --- a/Makefile +++ b/Makefile @@ -350,7 +350,7 @@ endif # This has to be kept in sync with Kconfig.host. MINIKCONF_ARGS = \ $(CONFIG_MINIKCONF_MODE) \ - $@ $*-config.devices.mak.d $< $(MINIKCONF_INPUTS) \ + $@ $*/config-devices.mak.d $< $(MINIKCONF_INPUTS) \ CONFIG_KVM=$(CONFIG_KVM) \ CONFIG_SPICE=$(CONFIG_SPICE) \ CONFIG_IVSHMEM=$(CONFIG_IVSHMEM) \ diff --git a/configure b/configure index 63f312bd1f..8999698bc2 100755 --- a/configure +++ b/configure @@ -1832,7 +1832,7 @@ exit 0 fi # Remove old dependency files to make sure that they get properly regenerated -rm -f *-config-devices.mak.d +rm -f */config-devices.mak.d if test -z "$python" then 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) \ |