kbuild: make samples really depend on headers_install

Kernel headers must be installed into $(objtree)/usr/include to avoid
the build failure of samples.

Commit ddea05fa148b ("kbuild: make samples depend on headers_install")
addressed this, but "samples/" is only used for the single target build.

"make samples/" properly installs kernel headers, but it does not work
for general building because a phony target "sample" (no trailing slash)
is used.

Reported-by: David Howells <[email protected]>
Signed-off-by: Masahiro Yamada <[email protected]>
Tested-by: David Howells <[email protected]>

diff --git a/Makefile b/Makefile
index d2832a45dffe1a1e0a2c72fc7f6224864dbe9f77..bb917de2491391086de5de07eca0085fd9653adc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1010,9 +1010,10 @@ ifdef CONFIG_GDB_SCRIPTS
 endif
        +$(call if_changed,link-vmlinux)
 
-# Build samples along the rest of the kernel
+# Build samples along the rest of the kernel. This needs headers_install.
 ifdef CONFIG_SAMPLES
 vmlinux-dirs += samples
+samples: headers_install
 endif
 
 # The actual objects are generated when descending,