Skip to content

Commit

Permalink
wireless: prefix header search paths with $(srctree)/
Browse files Browse the repository at this point in the history
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 48f6e3c
("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 <yamada.masahiro@socionext.com>
Acked-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  • Loading branch information
Masahiro Yamada authored and Kalle Valo committed Feb 1, 2019
1 parent b6958ad commit 030b436
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 12 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 += \
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 1 addition & 3 deletions drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion drivers/net/wireless/intel/iwlwifi/dvm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)/../
2 changes: 1 addition & 1 deletion drivers/net/wireless/intel/iwlwifi/mvm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ iwlmvm-$(CONFIG_IWLWIFI_DEBUGFS) += debugfs.o debugfs-vif.o
iwlmvm-$(CONFIG_IWLWIFI_LEDS) += led.o
iwlmvm-$(CONFIG_PM) += d3.o

ccflags-y += -I$(src)/../
ccflags-y += -I $(srctree)/$(src)/../
2 changes: 1 addition & 1 deletion drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)/..
2 changes: 1 addition & 1 deletion drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)/..

0 comments on commit 030b436

Please sign in to comment.