From patchwork Fri Jan 25 15:18:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 156609 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp479731jaa; Fri, 25 Jan 2019 07:19:21 -0800 (PST) X-Google-Smtp-Source: ALg8bN6iLQY2H4E1kQrgeVsSIzfpMd4SDzzBb0dNjpNC3PmVLF5RpHtJZ6fRjd5Afa0ePZ9w3jp2 X-Received: by 2002:a63:c00b:: with SMTP id h11mr10527238pgg.429.1548429561150; Fri, 25 Jan 2019 07:19:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548429561; cv=none; d=google.com; s=arc-20160816; b=CS1Xl+UfrNkCKMJ5Aa9W5zn881aQQ8l4+/fTllXtuZ3doGSNnC90bKWTeOpAy1GyRk MyGMl9OjqMw68vsX7Y+ZNgudBt96HNn/b3syf4qTJ5jdzIR1qky4vNNz1tvUeAXR9HW2 3AP9NX0Y3G4URhIYvMmak041rADQMB89B8/r+SA04YDthsifM4ApYUVV6fc1QIu5xXjn LkRNr5k06HUHwptDnP+IGbohhjYIkvbCAQVE7DJ02OJjgRQJgc7KnbW+BVmZMnvkJVwq 5txcSPjcbxPS/3DMtZ2VhHcXAICzLreIPi3/9Q+ha6mWmgnJOBDRgqGoRptsGcNSxZH6 XhWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=UjZn5mrVHgxUKzEuknpPlQFNQPWFnwzRirXQUCx7OAo=; b=VTmvWWK67UQ+dCGcBooF3ArpgTT1odctKsv+t8il4bPbL50xL1NJ8ewqb7QC21BfSC Lk8xnZQuiK7w1mOfIEs4XpWZ5xiToIUfavz3zyGjGOytRzHdDI/xOok4cjwCfepgNl0U U7o+Ct0Vns7BH/HoH89phPVzOJ3qNhhv4N7qqnL8PS0lgiI/hfCRBp1pAwZJUon0xaga 5bqjjvv2Gav94a/9OmJ6b1IUEHQFomJhqyZye62v4WADEDzmilvO3nWX1hLxdeOtV8wR Dp+D7XgNFE4XSVN2z6dC9sPc84oY8uLUaBIlUAB6rWvxsLnHLznHDl1OoYuchl9EW45x fKuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b="0U85/4lT"; 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 j187si25973918pfg.160.2019.01.25.07.19.20; Fri, 25 Jan 2019 07:19:21 -0800 (PST) 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.s=dec2015msa header.b="0U85/4lT"; 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 S1728816AbfAYPTT (ORCPT + 31 others); Fri, 25 Jan 2019 10:19:19 -0500 Received: from conuserg-07.nifty.com ([210.131.2.74]:57741 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726335AbfAYPTS (ORCPT ); Fri, 25 Jan 2019 10:19:18 -0500 X-Greylist: delayed 3384 seconds by postgrey-1.27 at vger.kernel.org; Fri, 25 Jan 2019 10:19:16 EST Received: from grover.tkatk1.zaq.ne.jp (zaqdadce369.zaq.ne.jp [218.220.227.105]) (authenticated) by conuserg-07.nifty.com with ESMTP id x0PFIASP009019; Sat, 26 Jan 2019 00:18:10 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x0PFIASP009019 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1548429492; bh=UjZn5mrVHgxUKzEuknpPlQFNQPWFnwzRirXQUCx7OAo=; h=From:To:Cc:Subject:Date:From; b=0U85/4lT/ZnAa9xa28dNJ90yRuM3vnUqe8/zfExsHB3uvdHmCvb82d/s/BuZfWZGm winqc+YlL4F9xzQvYAFbOJWEywjNYAiqpZ5YbChAtX2n18BFu+t31iBZW6II1KoRH1 gYPbYX+mFVoyTXT9UyG7tJBZgFPlZKDmrVYQrKDQMh3Hxd9bMJmBQ0ljTOYB500VHz 0paycTjufdwhKVWyIPzxv0NkYMGLdxyk6izJa8EiYE1Xnz6lzwro9cVcPsMWIsyrWU S86dv9UQ7sWCrR03VGwolNsyunvTgLoOR2ywzn8GKwsHRu7AJgEfGWqUtmixWABDU3 tgVbgtU0zpSug== X-Nifty-SrcIP: [218.220.227.105] From: Masahiro Yamada To: Kalle Valo , linux-wireless@vger.kernel.org Cc: Masahiro Yamada , brcm80211-dev-list.pdl@broadcom.com, Franky Lin , Intel Linux Wireless , Luca Coelho , Johannes Berg , netdev@vger.kernel.org, Emmanuel Grumbach , Chi-Hsien Lin , Hin-Tak Leung , Larry Finger , Herton Ronaldo Krzesinski , Hante Meuleman , Wright Feng , Arend van Spriel , brcm80211-dev-list@cypress.com, linux-kernel@vger.kernel.org, "David S. Miller" Subject: [PATCH] net: wireless: prefix header search paths with $(srctree)/ Date: Sat, 26 Jan 2019 00:18:00 +0900 Message-Id: <1548429480-22137-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, the Kbuild core manipulates header search paths in a crazy way [1]. To fix this mess, I want all Makefiles to add explicit $(srctree)/ to the search paths in the srctree. Some Makefiles are already written in that way, but not all. The goal of this work is to make the notation consistent, and finally get rid of the gross hacks. Having whitespaces after -I does not matter since commit 48f6e3cf5bc6 ("kbuild: do not drop -I without parameter"). I also removed one header search path in: drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile I was able to compile without it. [1]: https://patchwork.kernel.org/patch/9632347/ Signed-off-by: Masahiro Yamada --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile | 4 ++-- drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile | 6 +++--- drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile | 4 +--- drivers/net/wireless/intel/iwlwifi/dvm/Makefile | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 2 +- drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile | 2 +- drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile | 2 +- 7 files changed, 10 insertions(+), 12 deletions(-) -- 2.7.4 Acked-by: Luca Coelho diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile index 22fd95a..f7cf3e5 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile @@ -16,8 +16,8 @@ # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ccflags-y += \ - -Idrivers/net/wireless/broadcom/brcm80211/brcmfmac \ - -Idrivers/net/wireless/broadcom/brcm80211/include + -I $(srctree)/$(src) \ + -I $(srctree)/$(src)/../include obj-$(CONFIG_BRCMFMAC) += brcmfmac.o brcmfmac-objs += \ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile index ed83f33..482d773 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile @@ -16,9 +16,9 @@ # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ccflags-y := \ - -Idrivers/net/wireless/broadcom/brcm80211/brcmsmac \ - -Idrivers/net/wireless/broadcom/brcm80211/brcmsmac/phy \ - -Idrivers/net/wireless/broadcom/brcm80211/include + -I $(srctree)/$(src) \ + -I $(srctree)/$(src)/phy \ + -I $(srctree)/$(src)/../include brcmsmac-y := \ mac80211_if.o \ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile index 256c91f..bb02c62 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile +++ b/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile @@ -15,9 +15,7 @@ # OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -ccflags-y := \ - -Idrivers/net/wireless/broadcom/brcm80211/brcmutil \ - -Idrivers/net/wireless/broadcom/brcm80211/include +ccflags-y := -I $(srctree)/$(src)/../include obj-$(CONFIG_BRCMUTIL) += brcmutil.o brcmutil-objs = utils.o d11.o diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/Makefile b/drivers/net/wireless/intel/iwlwifi/dvm/Makefile index 702d42b..0486b17 100644 --- a/drivers/net/wireless/intel/iwlwifi/dvm/Makefile +++ b/drivers/net/wireless/intel/iwlwifi/dvm/Makefile @@ -11,4 +11,4 @@ iwldvm-objs += rxon.o devices.o iwldvm-$(CONFIG_IWLWIFI_LEDS) += led.o iwldvm-$(CONFIG_IWLWIFI_DEBUGFS) += debugfs.o -ccflags-y += -I$(src)/../ +ccflags-y += -I $(srctree)/$(src)/../ diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/Makefile b/drivers/net/wireless/intel/iwlwifi/mvm/Makefile index 9ffd219..7d1b318 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/Makefile +++ b/drivers/net/wireless/intel/iwlwifi/mvm/Makefile @@ -10,4 +10,4 @@ iwlmvm-$(CONFIG_IWLWIFI_LEDS) += led.o iwlmvm-y += tof.o iwlmvm-$(CONFIG_PM) += d3.o -ccflags-y += -I$(src)/../ +ccflags-y += -I $(srctree)/$(src)/../ diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile b/drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile index 2966681..5d6b06d 100644 --- a/drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile +++ b/drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile @@ -2,4 +2,4 @@ rtl818x_pci-objs := dev.o rtl8225.o sa2400.o max2820.o grf5101.o rtl8225se.o obj-$(CONFIG_RTL8180) += rtl818x_pci.o -ccflags-y += -Idrivers/net/wireless/realtek/rtl818x +ccflags-y += -I $(srctree)/$(src)/.. diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile b/drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile index ff07491..95bac73 100644 --- a/drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile +++ b/drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile @@ -2,4 +2,4 @@ rtl8187-objs := dev.o rtl8225.o leds.o rfkill.o obj-$(CONFIG_RTL8187) += rtl8187.o -ccflags-y += -Idrivers/net/wireless/realtek/rtl818x +ccflags-y += -I $(srctree)/$(src)/..