tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[media] drivers/media: do not use EXTRA_CFLAGS

Usage of these flags has been deprecated for nearly 4 years by:

commit f77bf01425b11947eeb3b5b54685212c302741b8
Author: Sam Ravnborg <sam@neptun.(none)>
Date: Mon Oct 15 22:25:06 2007 +0200

kbuild: introduce ccflags-y, asflags-y and ldflags-y

Moreover, these flags (at least EXTRA_CFLAGS) have been documented for command
line use. By default, gmake(1) do not override command line setting, so this is
likely to result in build failure or unexpected behavior.

Replace their usage by Kbuild's `{as,cc,ld}flags-y'.

Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: linux-media@vger.kernel.org
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Arnaud Lacombe and committed by
Mauro Carvalho Chehab 3f5c14d3 63f409a4

+92 -94
+2 -2
drivers/media/common/tuners/Makefile
··· 28 28 obj-$(CONFIG_MEDIA_TUNER_TDA18218) += tda18218.o 29 29 obj-$(CONFIG_MEDIA_TUNER_TDA18212) += tda18212.o 30 30 31 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 32 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends 31 + ccflags-y += -Idrivers/media/dvb/dvb-core 32 + ccflags-y += -Idrivers/media/dvb/frontends
+2 -2
drivers/media/dvb/b2c2/Makefile
··· 12 12 b2c2-flexcop-usb-objs = flexcop-usb.o 13 13 obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o 14 14 15 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ 16 - EXTRA_CFLAGS += -Idrivers/media/common/tuners/ 15 + ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ 16 + ccflags-y += -Idrivers/media/common/tuners/
+4 -4
drivers/media/dvb/bt8xx/Makefile
··· 1 1 obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o 2 2 3 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 4 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends 5 - EXTRA_CFLAGS += -Idrivers/media/video/bt8xx 6 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 3 + ccflags-y += -Idrivers/media/dvb/dvb-core 4 + ccflags-y += -Idrivers/media/dvb/frontends 5 + ccflags-y += -Idrivers/media/video/bt8xx 6 + ccflags-y += -Idrivers/media/common/tuners
+4 -4
drivers/media/dvb/ddbridge/Makefile
··· 6 6 7 7 obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o 8 8 9 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ 10 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends/ 11 - EXTRA_CFLAGS += -Idrivers/media/common/tuners/ 9 + ccflags-y += -Idrivers/media/dvb/dvb-core/ 10 + ccflags-y += -Idrivers/media/dvb/frontends/ 11 + ccflags-y += -Idrivers/media/common/tuners/ 12 12 13 13 # For the staging CI driver cxd2099 14 - EXTRA_CFLAGS += -Idrivers/staging/cxd2099/ 14 + ccflags-y += -Idrivers/staging/cxd2099/
+1 -1
drivers/media/dvb/dm1105/Makefile
··· 1 1 obj-$(CONFIG_DVB_DM1105) += dm1105.o 2 2 3 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends 3 + ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends
+2 -2
drivers/media/dvb/dvb-usb/Makefile
··· 97 97 dvb-usb-it913x-objs := it913x.o 98 98 obj-$(CONFIG_DVB_USB_IT913X) += dvb-usb-it913x.o 99 99 100 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ 100 + ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ 101 101 # due to tuner-xc3028 102 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 102 + ccflags-y += -Idrivers/media/common/tuners 103 103
+2 -2
drivers/media/dvb/frontends/Makefile
··· 2 2 # Makefile for the kernel DVB frontend device drivers. 3 3 # 4 4 5 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ 6 - EXTRA_CFLAGS += -Idrivers/media/common/tuners/ 5 + ccflags-y += -Idrivers/media/dvb/dvb-core/ 6 + ccflags-y += -Idrivers/media/common/tuners/ 7 7 8 8 stb0899-objs = stb0899_drv.o stb0899_algo.o 9 9 stv0900-objs = stv0900_core.o stv0900_sw.o
+1 -1
drivers/media/dvb/mantis/Makefile
··· 25 25 obj-$(CONFIG_DVB_MANTIS) += mantis.o 26 26 obj-$(CONFIG_DVB_HOPPER) += hopper.o 27 27 28 - EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ 28 + ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
+4 -4
drivers/media/dvb/ngene/Makefile
··· 6 6 7 7 obj-$(CONFIG_DVB_NGENE) += ngene.o 8 8 9 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ 10 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends/ 11 - EXTRA_CFLAGS += -Idrivers/media/common/tuners/ 9 + ccflags-y += -Idrivers/media/dvb/dvb-core/ 10 + ccflags-y += -Idrivers/media/dvb/frontends/ 11 + ccflags-y += -Idrivers/media/common/tuners/ 12 12 13 13 # For the staging CI driver cxd2099 14 - EXTRA_CFLAGS += -Idrivers/staging/cxd2099/ 14 + ccflags-y += -Idrivers/staging/cxd2099/
+1 -1
drivers/media/dvb/pluto2/Makefile
··· 1 1 obj-$(CONFIG_DVB_PLUTO2) += pluto2.o 2 2 3 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ 3 + ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
+1 -1
drivers/media/dvb/pt1/Makefile
··· 2 2 3 3 obj-$(CONFIG_DVB_PT1) += earth-pt1.o 4 4 5 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core -Idrivers/media/dvb/frontends 5 + ccflags-y += -Idrivers/media/dvb/dvb-core -Idrivers/media/dvb/frontends
+2 -2
drivers/media/dvb/siano/Makefile
··· 5 5 obj-$(CONFIG_SMS_USB_DRV) += smsusb.o 6 6 obj-$(CONFIG_SMS_SDIO_DRV) += smssdio.o 7 7 8 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 8 + ccflags-y += -Idrivers/media/dvb/dvb-core 9 9 10 - EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m) 10 + ccflags-y += $(extra-cflags-y) $(extra-cflags-m) 11 11
+2 -2
drivers/media/dvb/ttpci/Makefile
··· 17 17 obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-patch.o 18 18 obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o 19 19 20 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ 21 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 20 + ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ 21 + ccflags-y += -Idrivers/media/common/tuners
+1 -1
drivers/media/dvb/ttusb-budget/Makefile
··· 1 1 obj-$(CONFIG_DVB_TTUSB_BUDGET) += dvb-ttusb-budget.o 2 2 3 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends 3 + ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends
+1 -1
drivers/media/dvb/ttusb-dec/Makefile
··· 1 1 obj-$(CONFIG_DVB_TTUSB_DEC) += ttusb_dec.o ttusbdecfe.o 2 2 3 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ 3 + ccflags-y += -Idrivers/media/dvb/dvb-core/
+1 -1
drivers/media/radio/Makefile
··· 27 27 obj-$(CONFIG_RADIO_WL1273) += radio-wl1273.o 28 28 obj-$(CONFIG_RADIO_WL128X) += wl128x/ 29 29 30 - EXTRA_CFLAGS += -Isound 30 + ccflags-y += -Isound
+3 -3
drivers/media/video/Makefile
··· 190 190 191 191 obj-$(CONFIG_ARCH_OMAP) += omap/ 192 192 193 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 194 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends 195 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 193 + ccflags-y += -Idrivers/media/dvb/dvb-core 194 + ccflags-y += -Idrivers/media/dvb/frontends 195 + ccflags-y += -Idrivers/media/common/tuners
+4 -4
drivers/media/video/au0828/Makefile
··· 2 2 3 3 obj-$(CONFIG_VIDEO_AU0828) += au0828.o 4 4 5 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 6 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 7 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends 5 + ccflags-y += -Idrivers/media/common/tuners 6 + ccflags-y += -Idrivers/media/dvb/dvb-core 7 + ccflags-y += -Idrivers/media/dvb/frontends 8 8 9 - EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m) 9 + ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
+3 -3
drivers/media/video/bt8xx/Makefile
··· 8 8 9 9 obj-$(CONFIG_VIDEO_BT848) += bttv.o 10 10 11 - EXTRA_CFLAGS += -Idrivers/media/video 12 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 13 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 11 + ccflags-y += -Idrivers/media/video 12 + ccflags-y += -Idrivers/media/common/tuners 13 + ccflags-y += -Idrivers/media/dvb/dvb-core
+3 -3
drivers/media/video/cx18/Makefile
··· 8 8 obj-$(CONFIG_VIDEO_CX18) += cx18.o 9 9 obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o 10 10 11 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 12 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends 13 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 11 + ccflags-y += -Idrivers/media/dvb/dvb-core 12 + ccflags-y += -Idrivers/media/dvb/frontends 13 + ccflags-y += -Idrivers/media/common/tuners
+5 -5
drivers/media/video/cx231xx/Makefile
··· 8 8 obj-$(CONFIG_VIDEO_CX231XX_ALSA) += cx231xx-alsa.o 9 9 obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o 10 10 11 - EXTRA_CFLAGS += -Idrivers/media/video 12 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 13 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 14 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends 15 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-usb 11 + ccflags-y += -Idrivers/media/video 12 + ccflags-y += -Idrivers/media/common/tuners 13 + ccflags-y += -Idrivers/media/dvb/dvb-core 14 + ccflags-y += -Idrivers/media/dvb/frontends 15 + ccflags-y += -Idrivers/media/dvb/dvb-usb 16 16
+5 -5
drivers/media/video/cx23885/Makefile
··· 7 7 obj-$(CONFIG_VIDEO_CX23885) += cx23885.o 8 8 obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o 9 9 10 - EXTRA_CFLAGS += -Idrivers/media/video 11 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 12 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 13 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends 10 + ccflags-y += -Idrivers/media/video 11 + ccflags-y += -Idrivers/media/common/tuners 12 + ccflags-y += -Idrivers/media/dvb/dvb-core 13 + ccflags-y += -Idrivers/media/dvb/frontends 14 14 15 - EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m) 15 + ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
+1 -1
drivers/media/video/cx25840/Makefile
··· 3 3 4 4 obj-$(CONFIG_VIDEO_CX25840) += cx25840.o 5 5 6 - EXTRA_CFLAGS += -Idrivers/media/video 6 + ccflags-y += -Idrivers/media/video
+4 -4
drivers/media/video/cx88/Makefile
··· 10 10 obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o 11 11 obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o 12 12 13 - EXTRA_CFLAGS += -Idrivers/media/video 14 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 15 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 16 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends 13 + ccflags-y += -Idrivers/media/video 14 + ccflags-y += -Idrivers/media/common/tuners 15 + ccflags-y += -Idrivers/media/dvb/dvb-core 16 + ccflags-y += -Idrivers/media/dvb/frontends
+4 -4
drivers/media/video/em28xx/Makefile
··· 9 9 obj-$(CONFIG_VIDEO_EM28XX_ALSA) += em28xx-alsa.o 10 10 obj-$(CONFIG_VIDEO_EM28XX_DVB) += em28xx-dvb.o 11 11 12 - EXTRA_CFLAGS += -Idrivers/media/video 13 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 14 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 15 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends 12 + ccflags-y += -Idrivers/media/video 13 + ccflags-y += -Idrivers/media/common/tuners 14 + ccflags-y += -Idrivers/media/dvb/dvb-core 15 + ccflags-y += -Idrivers/media/dvb/frontends 16 16
+1 -1
drivers/media/video/gspca/gl860/Makefile
··· 6 6 gl860-ov9655.o \ 7 7 gl860-mi2020.o 8 8 9 - EXTRA_CFLAGS += -Idrivers/media/video/gspca 9 + ccflags-y += -Idrivers/media/video/gspca 10 10
+1 -1
drivers/media/video/gspca/m5602/Makefile
··· 8 8 m5602_s5k83a.o \ 9 9 m5602_s5k4aa.o 10 10 11 - EXTRA_CFLAGS += -Idrivers/media/video/gspca 11 + ccflags-y += -Idrivers/media/video/gspca
+1 -1
drivers/media/video/gspca/stv06xx/Makefile
··· 6 6 stv06xx_pb0100.o \ 7 7 stv06xx_st6422.o 8 8 9 - EXTRA_CFLAGS += -Idrivers/media/video/gspca 9 + ccflags-y += -Idrivers/media/video/gspca 10 10
+2 -2
drivers/media/video/hdpvr/Makefile
··· 2 2 3 3 obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o 4 4 5 - EXTRA_CFLAGS += -Idrivers/media/video 5 + ccflags-y += -Idrivers/media/video 6 6 7 - EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m) 7 + ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
+4 -4
drivers/media/video/ivtv/Makefile
··· 7 7 obj-$(CONFIG_VIDEO_IVTV) += ivtv.o 8 8 obj-$(CONFIG_VIDEO_FB_IVTV) += ivtvfb.o 9 9 10 - EXTRA_CFLAGS += -Idrivers/media/video 11 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 12 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 13 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends 10 + ccflags-y += -Idrivers/media/video 11 + ccflags-y += -Idrivers/media/common/tuners 12 + ccflags-y += -Idrivers/media/dvb/dvb-core 13 + ccflags-y += -Idrivers/media/dvb/frontends 14 14
+1 -3
drivers/media/video/omap3isp/Makefile
··· 1 1 # Makefile for OMAP3 ISP driver 2 2 3 - ifdef CONFIG_VIDEO_OMAP3_DEBUG 4 - EXTRA_CFLAGS += -DDEBUG 5 - endif 3 + ccflags-$(CONFIG_VIDEO_OMAP3_DEBUG) += -DDEBUG 6 4 7 5 omap3-isp-objs += \ 8 6 isp.o ispqueue.o ispvideo.o \
+4 -4
drivers/media/video/pvrusb2/Makefile
··· 16 16 17 17 obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o 18 18 19 - EXTRA_CFLAGS += -Idrivers/media/video 20 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 21 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 22 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends 19 + ccflags-y += -Idrivers/media/video 20 + ccflags-y += -Idrivers/media/common/tuners 21 + ccflags-y += -Idrivers/media/dvb/dvb-core 22 + ccflags-y += -Idrivers/media/dvb/frontends
+4 -4
drivers/media/video/saa7134/Makefile
··· 10 10 11 11 obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o 12 12 13 - EXTRA_CFLAGS += -Idrivers/media/video 14 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 15 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 16 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends 13 + ccflags-y += -Idrivers/media/video 14 + ccflags-y += -Idrivers/media/common/tuners 15 + ccflags-y += -Idrivers/media/dvb/dvb-core 16 + ccflags-y += -Idrivers/media/dvb/frontends
+5 -5
drivers/media/video/saa7164/Makefile
··· 4 4 5 5 obj-$(CONFIG_VIDEO_SAA7164) += saa7164.o 6 6 7 - EXTRA_CFLAGS += -Idrivers/media/video 8 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 9 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 10 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends 7 + ccflags-y += -Idrivers/media/video 8 + ccflags-y += -Idrivers/media/common/tuners 9 + ccflags-y += -Idrivers/media/dvb/dvb-core 10 + ccflags-y += -Idrivers/media/dvb/frontends 11 11 12 - EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m) 12 + ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
+4 -4
drivers/media/video/tlg2300/Makefile
··· 2 2 3 3 obj-$(CONFIG_VIDEO_TLG2300) += poseidon.o 4 4 5 - EXTRA_CFLAGS += -Idrivers/media/video 6 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 7 - EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core 8 - EXTRA_CFLAGS += -Idrivers/media/dvb/frontends 5 + ccflags-y += -Idrivers/media/video 6 + ccflags-y += -Idrivers/media/common/tuners 7 + ccflags-y += -Idrivers/media/dvb/dvb-core 8 + ccflags-y += -Idrivers/media/dvb/frontends 9 9
+2 -2
drivers/media/video/usbvision/Makefile
··· 2 2 3 3 obj-$(CONFIG_VIDEO_USBVISION) += usbvision.o 4 4 5 - EXTRA_CFLAGS += -Idrivers/media/video 6 - EXTRA_CFLAGS += -Idrivers/media/common/tuners 5 + ccflags-y += -Idrivers/media/video 6 + ccflags-y += -Idrivers/media/common/tuners