From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: linux-kbuild@vger.kernel.org
Cc: linux-arch@vger.kernel.org,
Masahiro Yamada <yamada.masahiro@socionext.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 03/28] kbuild: pass dst= to Makefile.headersinst from top Makefile
Date: Mon, 10 Jul 2017 03:32:35 +0900 [thread overview]
Message-ID: <1499625180-8067-4-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1499625180-8067-1-git-send-email-yamada.masahiro@socionext.com>
We can always pass dst= from the top Makefile. This will simplify
the logic in Makefile.headersinst.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
Makefile | 4 ++--
| 8 ++------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index ce5875628740..70c414b15859 100644
--- a/Makefile
+++ b/Makefile
@@ -1154,7 +1154,7 @@ PHONY += headers_install
headers_install: __headers
$(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \
$(error Headers not exportable for the $(SRCARCH) architecture))
- $(Q)$(MAKE) $(hdr-inst)=include/uapi
+ $(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include
$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst)
PHONY += headers_check_all
@@ -1163,7 +1163,7 @@ headers_check_all: headers_install_all
PHONY += headers_check
headers_check: headers_install
- $(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1
+ $(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include HDRCHECK=1
$(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) HDRCHECK=1
# ---------------------------------------------------------------------------
--git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index 4e9287bfdf28..e9147f05ea77 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -23,15 +23,12 @@ subdirs := $(patsubst $(srcdir)/%/,%,\
$(filter-out $(srcdir)/,\
$(sort $(dir $(wildcard $(srcdir)/*/)))))
-# caller may set destination dir (when installing to asm/)
-_dst := $(if $(dst),$(dst),$(obj))
-
# Recursion
__headers: $(subdirs)
.PHONY: $(subdirs)
$(subdirs):
- $(Q)$(MAKE) $(hdr-inst)=$(obj)/$@ dst=$(_dst)/$@
+ $(Q)$(MAKE) $(hdr-inst)=$(obj)/$@ dst=$(dst)/$@
# Skip header install/check for include/uapi and arch/$(hdr-arch)/include/uapi.
# We have only sub-directories there.
@@ -48,8 +45,7 @@ ifneq ($(wildcard $(old-kbuild-file)),)
include $(old-kbuild-file)
endif
-installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst))
-
+installdir := $(INSTALL_HDR_PATH)/$(dst)
gendir := $(objtree)/$(subst include/,include/generated/,$(obj))
header-files := $(notdir $(wildcard $(srcdir)/*.h))
header-files += $(notdir $(wildcard $(srcdir)/*.agh))
--
2.7.4
next prev parent reply other threads:[~2017-07-09 18:37 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-09 18:32 [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 01/28] kbuild: remove useless $(gen) variable in Makefile.headersinst Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 02/28] kbuild: fix comment about dst of headers_{install,check}_all Masahiro Yamada
2017-07-09 18:32 ` Masahiro Yamada [this message]
2017-07-09 18:32 ` [PATCH v2 04/28] arm64: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 05/28] ARM: " Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 06/28] arc: " Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 07/28] blackfin: " Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 08/28] c6x: " Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 09/28] cris: " Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 10/28] h8300: " Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 11/28] hexagon: " Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 12/28] ia64: remove redundant generic-y += kvm_para.h from asm/Kbuild Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 13/28] m32r: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 14/28] m68k: " Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 15/28] metag: " Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 16/28] microblaze: " Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 17/28] nios2: remove unneeded arch/nios2/include/(generated/)asm/signal.h Masahiro Yamada
2017-07-11 9:19 ` Tobias Klauser
2017-07-09 18:32 ` [PATCH v2 18/28] nios2: move generic-y of exported headers to uapi/asm/Kbuild Masahiro Yamada
2017-07-11 9:20 ` Tobias Klauser
2017-07-09 18:32 ` [PATCH v2 19/28] openrisc: " Masahiro Yamada
2017-07-10 20:21 ` Stafford Horne
2017-07-09 18:32 ` [PATCH v2 20/28] parisc: " Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 21/28] sh: " Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 22/28] sparc: " Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 23/28] tile: " Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 24/28] unicore32: " Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 25/28] xtensa: " Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 26/28] kbuild: do not include old-kbuild-file from Makefile.headersinst Masahiro Yamada
2017-07-09 18:32 ` [PATCH v2 27/28] kbuild: split exported generic header creation into uapi-asm-generic Masahiro Yamada
2017-07-09 18:33 ` [PATCH v2 28/28] kbuild: remove wrapper files handling from Makefile.headersinst Masahiro Yamada
2017-07-10 8:42 ` [PATCH v2 00/28] kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Sam Ravnborg
2017-07-10 9:12 ` Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1499625180-8067-4-git-send-email-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).