Skip to content

Commit 14340de

Browse files
masahir0ymasahir0y
committed
media: 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 48f6e3c ("kbuild: do not drop -I without parameter"). [1]: https://patchwork.kernel.org/patch/9632347/ Signed-off-by: Masahiro Yamada <[email protected]> Reviewed-by: Sakari Ailus <[email protected]>
1 parent cc966c9 commit 14340de

File tree

30 files changed

+47
-49
lines changed

30 files changed

+47
-49
lines changed

‎drivers/media/common/b2c2/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ b2c2-flexcop-objs += flexcop-sram.o flexcop-eeprom.o flexcop-misc.o
44
b2c2-flexcop-objs += flexcop-hw-filter.o
55
obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
66

7-
ccflags-y += -Idrivers/media/dvb-frontends/
8-
ccflags-y += -Idrivers/media/tuners/
7+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/
8+
ccflags-y += -I $(srctree)/drivers/media/tuners/

‎drivers/media/i2c/smiapp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ smiapp-objs += smiapp-core.o smiapp-regs.o \
22
smiapp-quirk.o smiapp-limits.o
33
obj-$(CONFIG_VIDEO_SMIAPP) += smiapp.o
44

5-
ccflags-y += -Idrivers/media/i2c
5+
ccflags-y += -I $(srctree)/drivers/media/i2c

‎drivers/media/mmc/siano/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
obj-$(CONFIG_SMS_SDIO_DRV) += smssdio.o
22

3-
ccflags-y += -Idrivers/media/common/siano
4-
3+
ccflags-y += -I $(srctree)/drivers/media/common/siano

‎drivers/media/pci/b2c2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ endif
66
b2c2-flexcop-pci-objs += flexcop-pci.o
77
obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o
88

9-
ccflags-y += -Idrivers/media/common/b2c2/
9+
ccflags-y += -I $(srctree)/drivers/media/common/b2c2/

‎drivers/media/pci/bt8xx/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o \
66
obj-$(CONFIG_VIDEO_BT848) += bttv.o
77
obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
88

9-
ccflags-y += -Idrivers/media/dvb-frontends
10-
ccflags-y += -Idrivers/media/tuners
9+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
10+
ccflags-y += -I $(srctree)/drivers/media/tuners

‎drivers/media/pci/cx18/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ cx18-alsa-objs := cx18-alsa-main.o cx18-alsa-pcm.o
99
obj-$(CONFIG_VIDEO_CX18) += cx18.o
1010
obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o
1111

12-
ccflags-y += -Idrivers/media/dvb-frontends
13-
ccflags-y += -Idrivers/media/tuners
12+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
13+
ccflags-y += -I $(srctree)/drivers/media/tuners

‎drivers/media/pci/cx23885/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cx23885-objs := cx23885-cards.o cx23885-video.o cx23885-vbi.o \
88
obj-$(CONFIG_VIDEO_CX23885) += cx23885.o
99
obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
1010

11-
ccflags-y += -Idrivers/media/tuners
12-
ccflags-y += -Idrivers/media/dvb-frontends
11+
ccflags-y += -I $(srctree)/drivers/media/tuners
12+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
1313

1414
ccflags-y += $(extra-cflags-y) $(extra-cflags-m)

‎drivers/media/pci/cx88/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ obj-$(CONFIG_VIDEO_CX88_ALSA) += cx88-alsa.o
1010
obj-$(CONFIG_VIDEO_CX88_BLACKBIRD) += cx88-blackbird.o
1111
obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o
1212
obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
13-
ccflags-y += -Idrivers/media/tuners
14-
ccflags-y += -Idrivers/media/dvb-frontends
13+
ccflags-y += -I $(srctree)/drivers/media/tuners
14+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends

‎drivers/media/pci/ddbridge/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ ddbridge-objs := ddbridge-main.o ddbridge-core.o ddbridge-ci.o \
99

1010
obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o
1111

12-
ccflags-y += -Idrivers/media/dvb-frontends/
13-
ccflags-y += -Idrivers/media/tuners/
12+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/
13+
ccflags-y += -I $(srctree)/drivers/media/tuners/

‎drivers/media/pci/dm1105/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
obj-$(CONFIG_DVB_DM1105) += dm1105.o
22

3-
ccflags-y += -Idrivers/media/dvb-frontends
3+
ccflags-y += -I $(srctree)/drivers/media/dvb-frontends

0 commit comments

Comments
 (0)