From patchwork Mon Jun 12 03:26:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 9780387 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4CD4D60352 for ; Mon, 12 Jun 2017 03:32:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E09026E69 for ; Mon, 12 Jun 2017 03:32:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3CC2F28294; Mon, 12 Jun 2017 03:32:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D93128624 for ; Mon, 12 Jun 2017 03:32:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752380AbdFLDct (ORCPT ); Sun, 11 Jun 2017 23:32:49 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:63926 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752078AbdFLD2F (ORCPT ); Sun, 11 Jun 2017 23:28:05 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id v5C3RXP1001077; Mon, 12 Jun 2017 12:27:37 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v5C3RXP1001077 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1497238057; bh=c5A+GaygmeCDXJNL9JZQdMf/roTUHXxLJRpjd5O9Lto=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V6ZbwFY9SSrmOOC3dxHvO2ymec/lZMeRWN7Om7/5x+muNYzPvCtaWr3WO5hkJA+z4 0rZOG7Aod/JjP9eWs9jUccTudZBz98pw2JgeN1i/Dx9TeRppDQUVvc9BGwWEDe6yvi FMbf5dUQQCsa4DIZf5vS3+9R8roF05NeWnxeCfdbQJrvqAWu3CGedMZT1zcYsi9vv3 cLXAm+bXYYZBS9zeCWBCsi6a/AImftcK0hAlVImoNuTtLVLWdXDJR6HLNdZF5kkeYm 3s/JwmUrrMeEFShyoXI8GIAQB7w+EAeW4AXxeq4ydYRReAgZT2kWAnl9qW++iMIq8A QzWM/8TNZiTYw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org, linux-arch Cc: Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 01/27] kbuild: remove useless $(gen) variable in Makefile.headersinst Date: Mon, 12 Jun 2017 12:26:55 +0900 Message-Id: <1497238041-7011-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497238041-7011-1-git-send-email-yamada.masahiro@socionext.com> References: <1497238041-7011-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We have no true case for the $(if $(gen), ...) conditional. Drop it to simplify the gendir calculation. Signed-off-by: Masahiro Yamada --- scripts/Makefile.headersinst | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index ce753a408c56..c801bc129635 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -31,9 +31,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) @@ -45,7 +42,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))