summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-04-24 15:44:56 +0100
committerJavier Jardón <jjardon@gnome.org>2016-04-13 01:50:31 +0100
commit07a5d6d7c23ac387e5cc3bb712816ac6f198e6b6 (patch)
treedcf60cd3f9366b3196f06eb6fbf39b04c1fba35d
parent3842b07578ca8c7473e5d96e0bd2000629540426 (diff)
downloadlinux-stable-07a5d6d7c23ac387e5cc3bb712816ac6f198e6b6.tar.gz
Do not mix implicit and normal rulesbaserock/v2.6.28.9/openbmc_aspeed_wedge
compilation fail with modern versions of make because of this
-rw-r--r--Makefile12
1 files changed, 10 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9ca78258da66..01b149a56789 100644
--- a/Makefile
+++ b/Makefile
@@ -439,7 +439,11 @@ ifeq ($(config-targets),1)
include $(srctree)/arch/$(SRCARCH)/Makefile
export KBUILD_DEFCONFIG KBUILD_KCONFIG
-config %config: scripts_basic outputmakefile FORCE
+config: scripts_basic outputmakefile FORCE
+ $(Q)mkdir -p include/linux include/config
+ $(Q)$(MAKE) $(build)=scripts/kconfig $@
+
+%config: scripts_basic outputmakefile FORCE
$(Q)mkdir -p include/linux include/config
$(Q)$(MAKE) $(build)=scripts/kconfig $@
@@ -1607,7 +1611,11 @@ endif
$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
# Modules
-/ %/: prepare scripts FORCE
+/: prepare scripts FORCE
+ $(cmd_crmodverdir)
+ $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+ $(build)=$(build-dir)
+%/: prepare scripts FORCE
$(cmd_crmodverdir)
$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
$(build)=$(build-dir)