Browse Source

kbuild: build sample modules along with the rest of the kernel

Make sample modules in parallel with the rest of the kernel rather
than having them built from the vmlinux target. This makes the build
slightly faster, and those modules are properly considered when
adjust_autoksyms.sh is executed.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Nicolas Pitre 9 years ago
parent
commit
dd92478a15
1 changed files with 5 additions and 3 deletions
  1. 5 3
      Makefile

+ 5 - 3
Makefile

@@ -940,9 +940,6 @@ endif
 ifdef CONFIG_HEADERS_CHECK
 ifdef CONFIG_HEADERS_CHECK
 	$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
 	$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
 endif
 endif
-ifdef CONFIG_SAMPLES
-	$(Q)$(MAKE) $(build)=samples
-endif
 ifdef CONFIG_BUILD_DOCSRC
 ifdef CONFIG_BUILD_DOCSRC
 	$(Q)$(MAKE) $(build)=Documentation
 	$(Q)$(MAKE) $(build)=Documentation
 endif
 endif
@@ -960,6 +957,11 @@ PHONY += autoksyms_recursive
 include/generated/autoksyms.h: FORCE
 include/generated/autoksyms.h: FORCE
 	$(Q)$(CONFIG_SHELL) scripts/adjust_autoksyms.sh true
 	$(Q)$(CONFIG_SHELL) scripts/adjust_autoksyms.sh true
 
 
+# Build samples along the rest of the kernel
+ifdef CONFIG_SAMPLES
+vmlinux-dirs += samples
+endif
+
 # The actual objects are generated when descending,
 # The actual objects are generated when descending,
 # make sure no implicit rule kicks in
 # make sure no implicit rule kicks in
 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;