media: prefix header search paths with $(srctree)/
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Mon, 13 May 2019 06:22:15 +0000 (15:22 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Sat, 18 May 2019 02:49:56 +0000 (11:49 +0900)
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").

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

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
30 files changed:
drivers/media/common/b2c2/Makefile
drivers/media/i2c/smiapp/Makefile
drivers/media/mmc/siano/Makefile
drivers/media/pci/b2c2/Makefile
drivers/media/pci/bt8xx/Makefile
drivers/media/pci/cx18/Makefile
drivers/media/pci/cx23885/Makefile
drivers/media/pci/cx88/Makefile
drivers/media/pci/ddbridge/Makefile
drivers/media/pci/dm1105/Makefile
drivers/media/pci/mantis/Makefile
drivers/media/pci/netup_unidvb/Makefile
drivers/media/pci/ngene/Makefile
drivers/media/pci/pluto2/Makefile
drivers/media/pci/pt1/Makefile
drivers/media/pci/pt3/Makefile
drivers/media/pci/smipcie/Makefile
drivers/media/pci/ttpci/Makefile
drivers/media/platform/sti/c8sectpfe/Makefile
drivers/media/spi/Makefile
drivers/media/usb/as102/Makefile
drivers/media/usb/au0828/Makefile
drivers/media/usb/b2c2/Makefile
drivers/media/usb/cx231xx/Makefile
drivers/media/usb/em28xx/Makefile
drivers/media/usb/go7007/Makefile
drivers/media/usb/pvrusb2/Makefile
drivers/media/usb/siano/Makefile
drivers/media/usb/tm6000/Makefile
drivers/media/usb/ttusb-budget/Makefile

index aa2dc2434ee5855b0b7fed13aba269695117f75a..0e32b77f349ba21a624c5df7db695fc91ad2a5e8 100644 (file)
@@ -4,5 +4,5 @@ b2c2-flexcop-objs += flexcop-sram.o flexcop-eeprom.o flexcop-misc.o
 b2c2-flexcop-objs += flexcop-hw-filter.o
 obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o
 
-ccflags-y += -Idrivers/media/dvb-frontends/
-ccflags-y += -Idrivers/media/tuners/
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/
+ccflags-y += -I $(srctree)/drivers/media/tuners/
index f45a003cbe7e3dbbedfc5d87882389c8d666650a..9f03aefd4fd77a94d7e8ef5eee49792b68cd89ea 100644 (file)
@@ -2,4 +2,4 @@ smiapp-objs                     += smiapp-core.o smiapp-regs.o \
                                   smiapp-quirk.o smiapp-limits.o
 obj-$(CONFIG_VIDEO_SMIAPP)     += smiapp.o
 
-ccflags-y += -Idrivers/media/i2c
+ccflags-y += -I $(srctree)/drivers/media/i2c
index 5fc345645a8057a2a7c4c04613b63d138297326b..848548feeb19090de792e8733c2977888b35aed7 100644 (file)
@@ -1,4 +1,3 @@
 obj-$(CONFIG_SMS_SDIO_DRV) += smssdio.o
 
-ccflags-y += -Idrivers/media/common/siano
-
+ccflags-y += -I $(srctree)/drivers/media/common/siano
index b43b9167db5a32aee76ccceb858d5ef9a4c010cd..14ed6e441738509abf3315cd04d89ed5f83f86ed 100644 (file)
@@ -6,4 +6,4 @@ endif
 b2c2-flexcop-pci-objs += flexcop-pci.o
 obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o
 
-ccflags-y += -Idrivers/media/common/b2c2/
+ccflags-y += -I $(srctree)/drivers/media/common/b2c2/
index 0b5032c8a9c05380f0a1a68fa3b5e183f9132ba4..69bc0d9c478eeb2c945ee3facb21e7ea8428a16d 100644 (file)
@@ -6,5 +6,5 @@ bttv-objs      :=      bttv-driver.o bttv-cards.o bttv-if.o \
 obj-$(CONFIG_VIDEO_BT848) += bttv.o
 obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o
 
-ccflags-y += -Idrivers/media/dvb-frontends
-ccflags-y += -Idrivers/media/tuners
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
+ccflags-y += -I $(srctree)/drivers/media/tuners
index 9c82c2df05e1da46289ad4656b977e9e3176415a..df00ef8b4521e6c22eaf4ac3f4e87a3e2fc022c0 100644 (file)
@@ -9,5 +9,5 @@ cx18-alsa-objs := cx18-alsa-main.o cx18-alsa-pcm.o
 obj-$(CONFIG_VIDEO_CX18) += cx18.o
 obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o
 
-ccflags-y += -Idrivers/media/dvb-frontends
-ccflags-y += -Idrivers/media/tuners
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
+ccflags-y += -I $(srctree)/drivers/media/tuners
index 130f0aa29ac602f2fc022852782ff1631f7a929c..a785169ec368df249ceee5b6140cfc3f8ad1e3f1 100644 (file)
@@ -8,7 +8,7 @@ cx23885-objs    := cx23885-cards.o cx23885-video.o cx23885-vbi.o \
 obj-$(CONFIG_VIDEO_CX23885) += cx23885.o
 obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o
 
-ccflags-y += -Idrivers/media/tuners
-ccflags-y += -Idrivers/media/dvb-frontends
+ccflags-y += -I $(srctree)/drivers/media/tuners
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
 
 ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
index d0f45d652d6e051487928163c2b3f61897b47d75..c2a015869760a291d9b9ef4b82e91c30971b2c7c 100644 (file)
@@ -10,5 +10,5 @@ obj-$(CONFIG_VIDEO_CX88_ALSA) += cx88-alsa.o
 obj-$(CONFIG_VIDEO_CX88_BLACKBIRD) += cx88-blackbird.o
 obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o
 obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
-ccflags-y += -Idrivers/media/tuners
-ccflags-y += -Idrivers/media/dvb-frontends
+ccflags-y += -I $(srctree)/drivers/media/tuners
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
index 5b6d5bbc38af65f94a7d13cd09477b68b8cce5e7..2b77c8d0eb2ecfed5e00e957253f4beb526b6f8c 100644 (file)
@@ -9,5 +9,5 @@ ddbridge-objs := ddbridge-main.o ddbridge-core.o ddbridge-ci.o \
 
 obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o
 
-ccflags-y += -Idrivers/media/dvb-frontends/
-ccflags-y += -Idrivers/media/tuners/
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/
+ccflags-y += -I $(srctree)/drivers/media/tuners/
index d22c2547ee86dd61f8115dc82abb6a54abd0e804..87e8e8052cdd7fcd6cf0ec4d8c31cf34071492f8 100644 (file)
@@ -1,3 +1,3 @@
 obj-$(CONFIG_DVB_DM1105) += dm1105.o
 
-ccflags-y += -Idrivers/media/dvb-frontends
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
index b5ef39692cb0ed6bf57c9134690b94cbea58eb70..49e82247b618350ba15a4258560e61b5603156f4 100644 (file)
@@ -26,4 +26,4 @@ obj-$(CONFIG_MANTIS_CORE)     += mantis_core.o
 obj-$(CONFIG_DVB_MANTIS)       += mantis.o
 obj-$(CONFIG_DVB_HOPPER)       += hopper.o
 
-ccflags-y += -Idrivers/media/dvb-frontends/
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/
index 944c3e1641579a94b78b7c634f0b4e52c230e793..215bdafcc27911ba7624a77fb160d48af85bf3c9 100644 (file)
@@ -6,4 +6,4 @@ netup-unidvb-objs += netup_unidvb_spi.o
 
 obj-$(CONFIG_DVB_NETUP_UNIDVB) += netup-unidvb.o
 
-ccflags-y += -Idrivers/media/dvb-frontends
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
index ec450ad1928173bb6029c49c0a81fa6655f5ee0f..5d16090e0677816a8e0363a635c43645c819b969 100644 (file)
@@ -7,5 +7,5 @@ ngene-objs := ngene-core.o ngene-i2c.o ngene-cards.o ngene-dvb.o
 
 obj-$(CONFIG_DVB_NGENE) += ngene.o
 
-ccflags-y += -Idrivers/media/dvb-frontends/
-ccflags-y += -Idrivers/media/tuners/
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/
+ccflags-y += -I $(srctree)/drivers/media/tuners/
index 3c2aea1ac7528ca8225d3ae42b63d168bcf1b0bc..4d21a2c1544dffe2172ba364547617c2fe6aaea4 100644 (file)
@@ -1,3 +1,3 @@
 obj-$(CONFIG_DVB_PLUTO2) += pluto2.o
 
-ccflags-y += -Idrivers/media/dvb-frontends/
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/
index bc491e08dd63d0d460dcc9348ef18c7e8ebc66a2..f80a1cd4c0f5422b89955ac7e937badca39e17d2 100644 (file)
@@ -2,5 +2,5 @@ earth-pt1-objs := pt1.o
 
 obj-$(CONFIG_DVB_PT1) += earth-pt1.o
 
-ccflags-y += -Idrivers/media/dvb-frontends
-ccflags-y += -Idrivers/media/tuners
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
+ccflags-y += -I $(srctree)/drivers/media/tuners
index 8698d5dfaf5259ae1c8f47061ea20bffc9ed36b9..da6b265f4b39dd1e7ef6e93a4bfe53a3587222c1 100644 (file)
@@ -4,5 +4,5 @@ earth-pt3-objs += pt3.o pt3_i2c.o pt3_dma.o
 
 obj-$(CONFIG_DVB_PT3) += earth-pt3.o
 
-ccflags-y += -Idrivers/media/dvb-frontends
-ccflags-y += -Idrivers/media/tuners
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
+ccflags-y += -I $(srctree)/drivers/media/tuners
index 214ebfe12cf740ff8c2316ae52af107f716f13ab..2426b75665531809a28e58cf37ed577c875ff189 100644 (file)
@@ -4,6 +4,5 @@ smipcie-objs    := smipcie-main.o smipcie-ir.o
 
 obj-$(CONFIG_DVB_SMIPCIE) += smipcie.o
 
-ccflags-y += -Idrivers/media/tuners
-ccflags-y += -Idrivers/media/dvb-frontends
-
+ccflags-y += -I $(srctree)/drivers/media/tuners
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
index 58ca12732aad4f96e6a472ef081c3aa1051628bf..9b44c479fcdd945479e7ca49c7397f46ac49d1af 100644 (file)
@@ -18,5 +18,5 @@ obj-$(CONFIG_DVB_BUDGET_CI) += budget-ci.o
 obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-patch.o
 obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o
 
-ccflags-y += -Idrivers/media/dvb-frontends/
-ccflags-y += -Idrivers/media/tuners
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/
+ccflags-y += -I $(srctree)/drivers/media/tuners
index 4bf0c6bf20e187850a2af034e01c4b77f2e1c89c..aedfc725cc19d84e775a14c3e99d1dafd9bd21ca 100644 (file)
@@ -4,5 +4,5 @@ c8sectpfe-y += c8sectpfe-core.o c8sectpfe-common.o c8sectpfe-dvb.o \
 
 obj-$(CONFIG_DVB_C8SECTPFE) += c8sectpfe.o
 
-ccflags-y += -Idrivers/media/dvb-frontends/
-ccflags-y += -Idrivers/media/tuners/
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/
+ccflags-y += -I $(srctree)/drivers/media/tuners/
index c254e2a70ec5ec82c21d8763cff450cadda50b2f..446e6c567e94fe8b3aa065426638180adb38110e 100644 (file)
@@ -1,4 +1,4 @@
 obj-$(CONFIG_VIDEO_GS1662) += gs1662.o
 obj-$(CONFIG_CXD2880_SPI_DRV) += cxd2880-spi.o
 
-ccflags-y += -Idrivers/media/dvb-frontends/cxd2880
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/cxd2880
index b0b319622edbfead811d0dfb114ae4698a294199..de671aed5dfc6692da2a43f1fa3ea21519b5f78e 100644 (file)
@@ -4,4 +4,4 @@ dvb-as102-objs := as102_drv.o as102_fw.o as10x_cmd.o as10x_cmd_stream.o \
 
 obj-$(CONFIG_DVB_AS102) += dvb-as102.o
 
-ccflags-y += -Idrivers/media/dvb-frontends
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
index 5691881c56c039f89c6c29f2f85860cf6553a4fc..4347812d101a2e8cf238ae812598a67c2e67e6f4 100644 (file)
@@ -11,7 +11,7 @@ endif
 
 obj-$(CONFIG_VIDEO_AU0828) += au0828.o
 
-ccflags-y += -Idrivers/media/tuners
-ccflags-y += -Idrivers/media/dvb-frontends
+ccflags-y += -I $(srctree)/drivers/media/tuners
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
 
 ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
index f3cef05f37b6a56bd2a1904ccf9d18fa12f19170..e7f949d18fbf155c1b1ccbd3ff41bd4fd1054456 100644 (file)
@@ -1,4 +1,4 @@
 b2c2-flexcop-usb-objs := flexcop-usb.o
 obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o
 
-ccflags-y += -Idrivers/media/common/b2c2/
+ccflags-y += -I $(srctree)/drivers/media/common/b2c2/
index af824fd803666b7ebe5e331e6addee3cd839cf06..8acbbcba7d0c05d97e3e7f3048415baa393064b3 100644 (file)
@@ -9,5 +9,5 @@ obj-$(CONFIG_VIDEO_CX231XX) += cx231xx.o
 obj-$(CONFIG_VIDEO_CX231XX_ALSA) += cx231xx-alsa.o
 obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o
 
-ccflags-y += -Idrivers/media/tuners
-ccflags-y += -Idrivers/media/dvb-frontends
+ccflags-y += -I $(srctree)/drivers/media/tuners
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
index 8a224007d755ca6453e09b54bd93e7f0bcc1b09f..8c2fc3104561946dbf04099c7b06d4150e5180e8 100644 (file)
@@ -11,5 +11,5 @@ obj-$(CONFIG_VIDEO_EM28XX_ALSA) += em28xx-alsa.o
 obj-$(CONFIG_VIDEO_EM28XX_DVB) += em28xx-dvb.o
 obj-$(CONFIG_VIDEO_EM28XX_RC) += em28xx-rc.o
 
-ccflags-y += -Idrivers/media/tuners
-ccflags-y += -Idrivers/media/dvb-frontends
+ccflags-y += -I $(srctree)/drivers/media/tuners
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
index 3d95bbc4192cb799c6eee69f591abc8efd1ca043..712a3507f195b4fee58ee126bb80706ae1dd3d05 100644 (file)
@@ -9,4 +9,4 @@ go7007-y := go7007-v4l2.o go7007-driver.o go7007-i2c.o go7007-fw.o \
 
 s2250-y := s2250-board.o
 
-ccflags-$(CONFIG_VIDEO_GO7007_LOADER:m=y) += -Idrivers/media/common
+ccflags-$(CONFIG_VIDEO_GO7007_LOADER:m=y) += -I $(srctree)/drivers/media/common
index 9facf6873404da4c0fcaa5d9cbb36defd406a92b..2e71afc4f6de9566674fddd98b02e03a85e539e7 100644 (file)
@@ -17,5 +17,5 @@ pvrusb2-objs  := pvrusb2-i2c-core.o \
 
 obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o
 
-ccflags-y += -Idrivers/media/tuners
-ccflags-y += -Idrivers/media/dvb-frontends
+ccflags-y += -I $(srctree)/drivers/media/tuners
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
index 7d48864e2782a7169c93c2b616c70498e8a82749..ba56e9818489e0afa0fca33c387df68ba749c29b 100644 (file)
@@ -1,5 +1,5 @@
 obj-$(CONFIG_SMS_USB_DRV) += smsusb.o
 
-ccflags-y += -Idrivers/media/common/siano
+ccflags-y += -I $(srctree)/drivers/media/common/siano
 ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
 
index 744c039e621a845302425361bcfc4d0d5f9f043b..75247a02a4857cfdc70a5889b0b6e6ca98bf98cd 100644 (file)
@@ -10,5 +10,5 @@ obj-$(CONFIG_VIDEO_TM6000) += tm6000.o
 obj-$(CONFIG_VIDEO_TM6000_ALSA) += tm6000-alsa.o
 obj-$(CONFIG_VIDEO_TM6000_DVB) += tm6000-dvb.o
 
-ccflags-y += -Idrivers/media/tuners
-ccflags-y += -Idrivers/media/dvb-frontends
+ccflags-y += -I $(srctree)/drivers/media/tuners
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends
index fe4372dddd0e8da75b0adf497824618a285daeff..37847d7739213a986078e45517c00e8730b9d9e1 100644 (file)
@@ -1,3 +1,3 @@
 obj-$(CONFIG_DVB_TTUSB_BUDGET) += dvb-ttusb-budget.o
 
-ccflags-y += -Idrivers/media/dvb-frontends
+ccflags-y += -I $(srctree)/drivers/media/dvb-frontends