linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 01/28] kbuild: remove useless $(gen) variable in Makefile.headersinst
Date: Mon, 10 Jul 2017 03:32:33 +0900	[thread overview]
Message-ID: <1499625180-8067-2-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1499625180-8067-1-git-send-email-yamada.masahiro@socionext.com>

We have no true case for the $(if $(gen), ...) conditional.  Drop it
to simplify the gendir calculation.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 scripts/Makefile.headersinst | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index c583a1e1bd3c..4e9287bfdf28 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -39,9 +39,6 @@ skip-inst := $(if $(filter %/uapi,$(obj)),1)
 
 ifeq ($(skip-inst),)
 
-# generated header directory
-gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj)))
-
 # Kbuild file is optional
 kbuild-file := $(srctree)/$(obj)/Kbuild
 -include $(kbuild-file)
@@ -53,7 +50,7 @@ endif
 
 installdir    := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst))
 
-gendir        := $(objtree)/$(gen)
+gendir        := $(objtree)/$(subst include/,include/generated/,$(obj))
 header-files  := $(notdir $(wildcard $(srcdir)/*.h))
 header-files  += $(notdir $(wildcard $(srcdir)/*.agh))
 header-files  := $(filter-out $(no-export-headers), $(header-files))
-- 
2.7.4

  reply	other threads:[~2017-07-09 18:39 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 ` Masahiro Yamada [this message]
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 ` [PATCH v2 03/28] kbuild: pass dst= to Makefile.headersinst from top Makefile Masahiro Yamada
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-2-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).