summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-01-06 11:26:18 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-01-06 11:26:18 +0100
commitf39d4d225ebdfdf5c2435e9895355c6b5fc74973 (patch)
treeffbbe92109e7323d43a6c18503a5f0a904fc0c2f /Makefile
parentd836124f8bbe05843a3f954727e6544a0fb96013 (diff)
parentd4d7a192587bb25051dbc845aab45301d22e6ed3 (diff)
downloadbarebox-f39d4d225ebdfdf5c2435e9895355c6b5fc74973.tar.gz
barebox-f39d4d225ebdfdf5c2435e9895355c6b5fc74973.tar.xz
Merge branch 'next'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 637960c2f8..2f6aa8100b 100644
--- a/Makefile
+++ b/Makefile
@@ -389,7 +389,11 @@ ifeq ($(config-targets),1)
include $(srctree)/arch/$(ARCH)/Makefile
export KBUILD_DEFCONFIG
-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 $@
@@ -1251,7 +1255,7 @@ target-dir = $(dir $@)
$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
# Modules
-/ %/: prepare scripts FORCE
+%/: prepare scripts FORCE
$(Q)$(MAKE) $(build)=$(build-dir)
%.ko: prepare scripts FORCE
$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \