Commit 2fa49589 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Greg Kroah-Hartman
Browse files

staging: 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").

[1]: https://patchwork.kernel.org/patch/9632347/



Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ee593133

drivers/staging/erofs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ ccflags-y += -Wall -DEROFS_VERSION=\"$(EROFS_VERSION)\" 


obj-$(CONFIG_EROFS_FS) += erofs.o

# staging requirement: to be self-contained in its own directory

ccflags-y += -I$(src)/include

ccflags-y += -I $(srctree)/$(src)/include

erofs-objs := super.o inode.o data.o namei.o dir.o utils.o

erofs-$(CONFIG_EROFS_FS_XATTR) += xattr.o

erofs-$(CONFIG_EROFS_FS_ZIP) += unzip_vle.o unzip_vle_lz4.o

drivers/staging/media/davinci_vpfe/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ davinci-vfpe-objs := \ 


# Allow building it with COMPILE_TEST on other archs

ifndef CONFIG_ARCH_DAVINCI

ccflags-y += -Iarch/arm/mach-davinci/include/

ccflags-y += -I $(srctree)/arch/arm/mach-davinci/include/

endif

drivers/staging/most/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_MOST) += most_core.o

most_core-y := core.o

ccflags-y += -Idrivers/staging/

ccflags-y += -I $(srctree)/drivers/staging/



obj-$(CONFIG_MOST_CDEV)	+= cdev/

obj-$(CONFIG_MOST_NET)	+= net/

drivers/staging/most/cdev/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_MOST_CDEV) += most_cdev.o



most_cdev-objs := cdev.o

ccflags-y += -Idrivers/staging/
 
ccflags-y += -I $(srctree)/drivers/staging/

drivers/staging/most/dim2/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_MOST_DIM2) += most_dim2.o



most_dim2-objs := dim2.o hal.o sysfs.o

ccflags-y += -Idrivers/staging/
 
ccflags-y += -I $(srctree)/drivers/staging/

CRA Git | Maintained and supported by SUSTech CRA and CCSE