summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2019-06-04 19:14:04 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2019-06-15 19:57:02 +0900
commita5bae54c106db8734d5ca81e2eb8e0351dd11737 (patch)
tree5c118a31a5766dda4f3d08f5da60e327e950056e
parentd5470d14431e9d39ee2131323589afac2a0bfee4 (diff)
downloadlinux-stable-a5bae54c106db8734d5ca81e2eb8e0351dd11737.tar.gz
linux-stable-a5bae54c106db8734d5ca81e2eb8e0351dd11737.tar.bz2
linux-stable-a5bae54c106db8734d5ca81e2eb8e0351dd11737.zip
kbuild: move hdr-inst shorthand to top Makefile
Now that hdr-inst is used only in the top Makefile, move it there from scripts/Kbuild.include. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r--Makefile2
-rw-r--r--scripts/Kbuild.include6
2 files changed, 2 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 507ce2c92065..e124a3e73bfe 100644
--- a/Makefile
+++ b/Makefile
@@ -1190,6 +1190,8 @@ headers_install: headers
PHONY += archheaders archscripts
+hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj
+
PHONY += headers
headers: $(version_h) scripts_unifdef uapi-asm-generic archheaders archscripts
$(if $(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/Kbuild),, \
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index f641bb0aa63f..0ae07e83d393 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -187,12 +187,6 @@ dtbinst := -f $(srctree)/scripts/Makefile.dtbinst obj
# $(Q)$(MAKE) $(clean)=dir
clean := -f $(srctree)/scripts/Makefile.clean obj
-###
-# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.headersinst obj=
-# Usage:
-# $(Q)$(MAKE) $(hdr-inst)=dir
-hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj
-
# echo command.
# Short version is used, if $(quiet) equals `quiet_', otherwise full one.
echo-cmd = $(if $($(quiet)cmd_$(1)),\