From patchwork Sun Jul 9 18:32:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 107263 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2541981qge; Sun, 9 Jul 2017 11:38:22 -0700 (PDT) X-Received: by 10.84.229.136 with SMTP id c8mr14515392plk.27.1499625502306; Sun, 09 Jul 2017 11:38:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499625502; cv=none; d=google.com; s=arc-20160816; b=Db7qkx+ICK84kzyN0/7bL4KA8BmOptu8VFR/yQKRlKDWbBznBv2IgAN5GRm91Ocxs5 hh3phYJV0qhH4bjdo1+hFTtPJ/X5AYZiV4OhEIGVHpq/zf+PkZ11cT+93LMiGuPzbn7G Pd7zi2UVOwtTKBP+jdNW9F+A2SMUC6W5QT/DTMLN+dNp3ux0QiOMQWc0RFgto9Iexub0 1GifxCqRZvKHQ1ck1ht4E5ge0a4FzRsFyB3L4AXW1uttQREoFqb7kySQi7nYZmnTr26Y BtRBE5UVyP3eQUvqNasrK0qihBdjrtf24DnGUImVl6Q4QEHSMzpeiJDHmIT7MLfDXI3b kljQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=YQNZ4nlmpwbo4421MryuNLAUpa/uKc4W79iaLGZE/KA=; b=AYqc4jwjHfOVZGJoDvHqrIV3K4FlVrYfDRKcYdncCPJ+4fKZjgCelHFMkf7PQQ6QvO hKFiwf9n8qGQtu9vd+u/zSOR3dHvMJgRQw+0P1OXWmYxDzzzL0RDEkZsy6Dp9MWjKh/o /sD9ZvW+MAvgieMXXBWWFSekd3COJqsX59lMHSNrAHn8ESAC5lAv9EwuUqsmcLY6kXEo gcI4CIIzwSa9DlohqED0eMwmfYKq+swxSQKRQkM3Q3T5/wtRnUlZ0JklqCXXoHtfS7d1 klMbZSHMgy+ZEq6FSQYtl4bjvFzrwAWLVE6N8JuNmuUH5BRNTqxNVEYCXwZG/85+KD8G dMeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.b=ZzWq83Ht; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 64si2019792pla.387.2017.07.09.11.38.21; Sun, 09 Jul 2017 11:38:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.b=ZzWq83Ht; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753305AbdGISh6 (ORCPT + 25 others); Sun, 9 Jul 2017 14:37:58 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:45698 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752554AbdGISdR (ORCPT ); Sun, 9 Jul 2017 14:33:17 -0400 Received: from grover.sesame (FL1-122-131-185-176.osk.mesh.ad.jp [122.131.185.176]) (authenticated) by conuserg-08.nifty.com with ESMTP id v69IX2Cx000353; Mon, 10 Jul 2017 03:33:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v69IX2Cx000353 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1499625190; bh=YQNZ4nlmpwbo4421MryuNLAUpa/uKc4W79iaLGZE/KA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZzWq83HtcW33FCqrO89a0FqT/C8/kyN2hFdyZwmQaQjERPeMvX8rvIBasyZ81fSDU IkaIgDRVziXfdR7gWi2yURebQRcteRzGFqyqmuw77ArzwdlCZtRujLjZEw8GQU1O1B YVW0QHhljKfVWmcpxw+3bZfCkj2Jngf4+OvLIR2BxoRp5NRdX22wpUSHGg4LHRfH0p wzUHQk1mk2OzGX/0cocIB4FsF0S2Dr7NFamPl56vv5eVEH9cuDUYFlkq5qkz/nVdZs 9R0uvx/IdvH5psKP8XPYYUQVvwQZnwERb7no/8v7plZK1JM/ZsA786bCeSWtCmB9gz 9V1nzFoR1bBRQ== X-Nifty-SrcIP: [122.131.185.176] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-arch@vger.kernel.org, Masahiro Yamada , 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 Message-Id: <1499625180-8067-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499625180-8067-1-git-send-email-yamada.masahiro@socionext.com> References: <1499625180-8067-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We can always pass dst= from the top Makefile. This will simplify the logic in Makefile.headersinst. Signed-off-by: Masahiro Yamada --- Makefile | 4 ++-- scripts/Makefile.headersinst | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) -- 2.7.4 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 # --------------------------------------------------------------------------- diff --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))