Commit 030b4367 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Kalle Valo
Browse files

wireless: prefix header search paths with $(srctree)/ 

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 48f6e3cf
("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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent b6958ad0

drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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 += \

drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -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 \

drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -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

drivers/net/wireless/intel/iwlwifi/dvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)/../

drivers/net/wireless/intel/iwlwifi/mvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)/../

CRA Git | Maintained and supported by SUSTech CRA and CCSE