Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-3.10.git] / Makefile

diff --git a/Makefile b/Makefile
index 6d7527cee9fa051f4a32d33367b8d5dead95ee80..f9c264e243a2a01e78cd85d209b8cdae8102a6ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -773,6 +773,9 @@ endef
 vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) vmlinux.o FORCE
 ifdef CONFIG_HEADERS_CHECK
        $(Q)$(MAKE) -f $(srctree)/Makefile headers_check
+endif
+ifdef CONFIG_SAMPLES
+       $(Q)$(MAKE) $(build)=samples
 endif
        $(call vmlinux-modpost)
        $(call if_changed_rule,vmlinux__)