diff options
author | Arnaud Lacombe <lacombar@gmail.com> | 2011-08-15 01:07:08 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-03 17:50:59 -0400 |
commit | 3f5c14d3d3d7a3f508f2fffa62731f13f8efdfba (patch) | |
tree | 1248879aae03b2ffa6cb2067b7736e88bad5f8e0 /drivers/media | |
parent | 63f409a444fa295247363a28381314683d6f4596 (diff) |
[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>
Diffstat (limited to 'drivers/media')
36 files changed, 92 insertions, 94 deletions
diff --git a/drivers/media/common/tuners/Makefile b/drivers/media/common/tuners/Makefile index 20d24fca2cfb..196c12a55f9a 100644 --- a/drivers/media/common/tuners/Makefile +++ b/drivers/media/common/tuners/Makefile | |||
@@ -28,5 +28,5 @@ obj-$(CONFIG_MEDIA_TUNER_MAX2165) += max2165.o | |||
28 | obj-$(CONFIG_MEDIA_TUNER_TDA18218) += tda18218.o | 28 | obj-$(CONFIG_MEDIA_TUNER_TDA18218) += tda18218.o |
29 | obj-$(CONFIG_MEDIA_TUNER_TDA18212) += tda18212.o | 29 | obj-$(CONFIG_MEDIA_TUNER_TDA18212) += tda18212.o |
30 | 30 | ||
31 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 31 | ccflags-y += -Idrivers/media/dvb/dvb-core |
32 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 32 | ccflags-y += -Idrivers/media/dvb/frontends |
diff --git a/drivers/media/dvb/b2c2/Makefile b/drivers/media/dvb/b2c2/Makefile index b97cf7208a18..3d04a8dba99e 100644 --- a/drivers/media/dvb/b2c2/Makefile +++ b/drivers/media/dvb/b2c2/Makefile | |||
@@ -12,5 +12,5 @@ obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o | |||
12 | b2c2-flexcop-usb-objs = flexcop-usb.o | 12 | b2c2-flexcop-usb-objs = flexcop-usb.o |
13 | obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o | 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/ | 15 | ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ |
16 | EXTRA_CFLAGS += -Idrivers/media/common/tuners/ | 16 | ccflags-y += -Idrivers/media/common/tuners/ |
diff --git a/drivers/media/dvb/bt8xx/Makefile b/drivers/media/dvb/bt8xx/Makefile index d98f1d49ffa8..0713b3af2050 100644 --- a/drivers/media/dvb/bt8xx/Makefile +++ b/drivers/media/dvb/bt8xx/Makefile | |||
@@ -1,6 +1,6 @@ | |||
1 | obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o | 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 | 3 | ccflags-y += -Idrivers/media/dvb/dvb-core |
4 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 4 | ccflags-y += -Idrivers/media/dvb/frontends |
5 | EXTRA_CFLAGS += -Idrivers/media/video/bt8xx | 5 | ccflags-y += -Idrivers/media/video/bt8xx |
6 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 6 | ccflags-y += -Idrivers/media/common/tuners |
diff --git a/drivers/media/dvb/ddbridge/Makefile b/drivers/media/dvb/ddbridge/Makefile index de4fe193c3ef..cf7214edf65f 100644 --- a/drivers/media/dvb/ddbridge/Makefile +++ b/drivers/media/dvb/ddbridge/Makefile | |||
@@ -6,9 +6,9 @@ ddbridge-objs := ddbridge-core.o | |||
6 | 6 | ||
7 | obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o | 7 | obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o |
8 | 8 | ||
9 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ | 9 | ccflags-y += -Idrivers/media/dvb/dvb-core/ |
10 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends/ | 10 | ccflags-y += -Idrivers/media/dvb/frontends/ |
11 | EXTRA_CFLAGS += -Idrivers/media/common/tuners/ | 11 | ccflags-y += -Idrivers/media/common/tuners/ |
12 | 12 | ||
13 | # For the staging CI driver cxd2099 | 13 | # For the staging CI driver cxd2099 |
14 | EXTRA_CFLAGS += -Idrivers/staging/cxd2099/ | 14 | ccflags-y += -Idrivers/staging/cxd2099/ |
diff --git a/drivers/media/dvb/dm1105/Makefile b/drivers/media/dvb/dm1105/Makefile index 8ac28b0546af..95a008b71fe5 100644 --- a/drivers/media/dvb/dm1105/Makefile +++ b/drivers/media/dvb/dm1105/Makefile | |||
@@ -1,3 +1,3 @@ | |||
1 | obj-$(CONFIG_DVB_DM1105) += dm1105.o | 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 |
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile index 3494d410383d..03ae657dedd6 100644 --- a/drivers/media/dvb/dvb-usb/Makefile +++ b/drivers/media/dvb/dvb-usb/Makefile | |||
@@ -97,7 +97,7 @@ obj-$(CONFIG_DVB_USB_TECHNISAT_USB2) += dvb-usb-technisat-usb2.o | |||
97 | dvb-usb-it913x-objs := it913x.o | 97 | dvb-usb-it913x-objs := it913x.o |
98 | obj-$(CONFIG_DVB_USB_IT913X) += dvb-usb-it913x.o | 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 | # due to tuner-xc3028 | 101 | # due to tuner-xc3028 |
102 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 102 | ccflags-y += -Idrivers/media/common/tuners |
103 | 103 | ||
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile index 3da75eabd7da..18d045d78bdb 100644 --- a/drivers/media/dvb/frontends/Makefile +++ b/drivers/media/dvb/frontends/Makefile | |||
@@ -2,8 +2,8 @@ | |||
2 | # Makefile for the kernel DVB frontend device drivers. | 2 | # Makefile for the kernel DVB frontend device drivers. |
3 | # | 3 | # |
4 | 4 | ||
5 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ | 5 | ccflags-y += -Idrivers/media/dvb/dvb-core/ |
6 | EXTRA_CFLAGS += -Idrivers/media/common/tuners/ | 6 | ccflags-y += -Idrivers/media/common/tuners/ |
7 | 7 | ||
8 | stb0899-objs = stb0899_drv.o stb0899_algo.o | 8 | stb0899-objs = stb0899_drv.o stb0899_algo.o |
9 | stv0900-objs = stv0900_core.o stv0900_sw.o | 9 | stv0900-objs = stv0900_core.o stv0900_sw.o |
diff --git a/drivers/media/dvb/mantis/Makefile b/drivers/media/dvb/mantis/Makefile index 98dc5cd258ac..ec8116dcb368 100644 --- a/drivers/media/dvb/mantis/Makefile +++ b/drivers/media/dvb/mantis/Makefile | |||
@@ -25,4 +25,4 @@ obj-$(CONFIG_MANTIS_CORE) += mantis_core.o | |||
25 | obj-$(CONFIG_DVB_MANTIS) += mantis.o | 25 | obj-$(CONFIG_DVB_MANTIS) += mantis.o |
26 | obj-$(CONFIG_DVB_HOPPER) += hopper.o | 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/ |
diff --git a/drivers/media/dvb/ngene/Makefile b/drivers/media/dvb/ngene/Makefile index 2bc96874d044..89873615e683 100644 --- a/drivers/media/dvb/ngene/Makefile +++ b/drivers/media/dvb/ngene/Makefile | |||
@@ -6,9 +6,9 @@ ngene-objs := ngene-core.o ngene-i2c.o ngene-cards.o ngene-dvb.o | |||
6 | 6 | ||
7 | obj-$(CONFIG_DVB_NGENE) += ngene.o | 7 | obj-$(CONFIG_DVB_NGENE) += ngene.o |
8 | 8 | ||
9 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ | 9 | ccflags-y += -Idrivers/media/dvb/dvb-core/ |
10 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends/ | 10 | ccflags-y += -Idrivers/media/dvb/frontends/ |
11 | EXTRA_CFLAGS += -Idrivers/media/common/tuners/ | 11 | ccflags-y += -Idrivers/media/common/tuners/ |
12 | 12 | ||
13 | # For the staging CI driver cxd2099 | 13 | # For the staging CI driver cxd2099 |
14 | EXTRA_CFLAGS += -Idrivers/staging/cxd2099/ | 14 | ccflags-y += -Idrivers/staging/cxd2099/ |
diff --git a/drivers/media/dvb/pluto2/Makefile b/drivers/media/dvb/pluto2/Makefile index 7ac128724df8..700822350ec5 100644 --- a/drivers/media/dvb/pluto2/Makefile +++ b/drivers/media/dvb/pluto2/Makefile | |||
@@ -1,3 +1,3 @@ | |||
1 | obj-$(CONFIG_DVB_PLUTO2) += pluto2.o | 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/ |
diff --git a/drivers/media/dvb/pt1/Makefile b/drivers/media/dvb/pt1/Makefile index a66da17bbe31..d80d8e8e7c57 100644 --- a/drivers/media/dvb/pt1/Makefile +++ b/drivers/media/dvb/pt1/Makefile | |||
@@ -2,4 +2,4 @@ earth-pt1-objs := pt1.o va1j5jf8007s.o va1j5jf8007t.o | |||
2 | 2 | ||
3 | obj-$(CONFIG_DVB_PT1) += earth-pt1.o | 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 |
diff --git a/drivers/media/dvb/siano/Makefile b/drivers/media/dvb/siano/Makefile index c54140b5ab5a..f233b57c86fb 100644 --- a/drivers/media/dvb/siano/Makefile +++ b/drivers/media/dvb/siano/Makefile | |||
@@ -5,7 +5,7 @@ obj-$(CONFIG_SMS_SIANO_MDTV) += smsmdtv.o smsdvb.o | |||
5 | obj-$(CONFIG_SMS_USB_DRV) += smsusb.o | 5 | obj-$(CONFIG_SMS_USB_DRV) += smsusb.o |
6 | obj-$(CONFIG_SMS_SDIO_DRV) += smssdio.o | 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 | ||
diff --git a/drivers/media/dvb/ttpci/Makefile b/drivers/media/dvb/ttpci/Makefile index 8a4d5bb20a5b..f6e869372e30 100644 --- a/drivers/media/dvb/ttpci/Makefile +++ b/drivers/media/dvb/ttpci/Makefile | |||
@@ -17,5 +17,5 @@ obj-$(CONFIG_DVB_BUDGET_CI) += budget-ci.o | |||
17 | obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-patch.o | 17 | obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-patch.o |
18 | obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o | 18 | obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o |
19 | 19 | ||
20 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ | 20 | ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ |
21 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 21 | ccflags-y += -Idrivers/media/common/tuners |
diff --git a/drivers/media/dvb/ttusb-budget/Makefile b/drivers/media/dvb/ttusb-budget/Makefile index fbe2b9514c21..8d6c4acb7f1d 100644 --- a/drivers/media/dvb/ttusb-budget/Makefile +++ b/drivers/media/dvb/ttusb-budget/Makefile | |||
@@ -1,3 +1,3 @@ | |||
1 | obj-$(CONFIG_DVB_TTUSB_BUDGET) += dvb-ttusb-budget.o | 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 |
diff --git a/drivers/media/dvb/ttusb-dec/Makefile b/drivers/media/dvb/ttusb-dec/Makefile index 2d70a8269391..ed28b5384d20 100644 --- a/drivers/media/dvb/ttusb-dec/Makefile +++ b/drivers/media/dvb/ttusb-dec/Makefile | |||
@@ -1,3 +1,3 @@ | |||
1 | obj-$(CONFIG_DVB_TTUSB_DEC) += ttusb_dec.o ttusbdecfe.o | 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/ |
diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile index f484a6e04eb2..390daf94d847 100644 --- a/drivers/media/radio/Makefile +++ b/drivers/media/radio/Makefile | |||
@@ -27,4 +27,4 @@ obj-$(CONFIG_RADIO_TIMBERDALE) += radio-timb.o | |||
27 | obj-$(CONFIG_RADIO_WL1273) += radio-wl1273.o | 27 | obj-$(CONFIG_RADIO_WL1273) += radio-wl1273.o |
28 | obj-$(CONFIG_RADIO_WL128X) += wl128x/ | 28 | obj-$(CONFIG_RADIO_WL128X) += wl128x/ |
29 | 29 | ||
30 | EXTRA_CFLAGS += -Isound | 30 | ccflags-y += -Isound |
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 272390072aef..c06f515d2edf 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
@@ -190,6 +190,6 @@ obj-y += davinci/ | |||
190 | 190 | ||
191 | obj-$(CONFIG_ARCH_OMAP) += omap/ | 191 | obj-$(CONFIG_ARCH_OMAP) += omap/ |
192 | 192 | ||
193 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 193 | ccflags-y += -Idrivers/media/dvb/dvb-core |
194 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 194 | ccflags-y += -Idrivers/media/dvb/frontends |
195 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 195 | ccflags-y += -Idrivers/media/common/tuners |
diff --git a/drivers/media/video/au0828/Makefile b/drivers/media/video/au0828/Makefile index 5c7f2f7d9805..bd22223f8d9f 100644 --- a/drivers/media/video/au0828/Makefile +++ b/drivers/media/video/au0828/Makefile | |||
@@ -2,8 +2,8 @@ au0828-objs := au0828-core.o au0828-i2c.o au0828-cards.o au0828-dvb.o au0828-vid | |||
2 | 2 | ||
3 | obj-$(CONFIG_VIDEO_AU0828) += au0828.o | 3 | obj-$(CONFIG_VIDEO_AU0828) += au0828.o |
4 | 4 | ||
5 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 5 | ccflags-y += -Idrivers/media/common/tuners |
6 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 6 | ccflags-y += -Idrivers/media/dvb/dvb-core |
7 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 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) |
diff --git a/drivers/media/video/bt8xx/Makefile b/drivers/media/video/bt8xx/Makefile index e415f6fc447c..3f9a2b22d3d4 100644 --- a/drivers/media/video/bt8xx/Makefile +++ b/drivers/media/video/bt8xx/Makefile | |||
@@ -8,6 +8,6 @@ bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o \ | |||
8 | 8 | ||
9 | obj-$(CONFIG_VIDEO_BT848) += bttv.o | 9 | obj-$(CONFIG_VIDEO_BT848) += bttv.o |
10 | 10 | ||
11 | EXTRA_CFLAGS += -Idrivers/media/video | 11 | ccflags-y += -Idrivers/media/video |
12 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 12 | ccflags-y += -Idrivers/media/common/tuners |
13 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 13 | ccflags-y += -Idrivers/media/dvb/dvb-core |
diff --git a/drivers/media/video/cx18/Makefile b/drivers/media/video/cx18/Makefile index 2fadd9ded340..a86bab5893ef 100644 --- a/drivers/media/video/cx18/Makefile +++ b/drivers/media/video/cx18/Makefile | |||
@@ -8,6 +8,6 @@ cx18-alsa-objs := cx18-alsa-main.o cx18-alsa-pcm.o | |||
8 | obj-$(CONFIG_VIDEO_CX18) += cx18.o | 8 | obj-$(CONFIG_VIDEO_CX18) += cx18.o |
9 | obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o | 9 | obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o |
10 | 10 | ||
11 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 11 | ccflags-y += -Idrivers/media/dvb/dvb-core |
12 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 12 | ccflags-y += -Idrivers/media/dvb/frontends |
13 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 13 | ccflags-y += -Idrivers/media/common/tuners |
diff --git a/drivers/media/video/cx231xx/Makefile b/drivers/media/video/cx231xx/Makefile index 2c2484355449..b3348975c7c2 100644 --- a/drivers/media/video/cx231xx/Makefile +++ b/drivers/media/video/cx231xx/Makefile | |||
@@ -8,9 +8,9 @@ obj-$(CONFIG_VIDEO_CX231XX) += cx231xx.o | |||
8 | obj-$(CONFIG_VIDEO_CX231XX_ALSA) += cx231xx-alsa.o | 8 | obj-$(CONFIG_VIDEO_CX231XX_ALSA) += cx231xx-alsa.o |
9 | obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o | 9 | obj-$(CONFIG_VIDEO_CX231XX_DVB) += cx231xx-dvb.o |
10 | 10 | ||
11 | EXTRA_CFLAGS += -Idrivers/media/video | 11 | ccflags-y += -Idrivers/media/video |
12 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 12 | ccflags-y += -Idrivers/media/common/tuners |
13 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 13 | ccflags-y += -Idrivers/media/dvb/dvb-core |
14 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 14 | ccflags-y += -Idrivers/media/dvb/frontends |
15 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-usb | 15 | ccflags-y += -Idrivers/media/dvb/dvb-usb |
16 | 16 | ||
diff --git a/drivers/media/video/cx23885/Makefile b/drivers/media/video/cx23885/Makefile index 23293c7b6ac7..185cc019d3db 100644 --- a/drivers/media/video/cx23885/Makefile +++ b/drivers/media/video/cx23885/Makefile | |||
@@ -7,9 +7,9 @@ cx23885-objs := cx23885-cards.o cx23885-video.o cx23885-vbi.o \ | |||
7 | obj-$(CONFIG_VIDEO_CX23885) += cx23885.o | 7 | obj-$(CONFIG_VIDEO_CX23885) += cx23885.o |
8 | obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o | 8 | obj-$(CONFIG_MEDIA_ALTERA_CI) += altera-ci.o |
9 | 9 | ||
10 | EXTRA_CFLAGS += -Idrivers/media/video | 10 | ccflags-y += -Idrivers/media/video |
11 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 11 | ccflags-y += -Idrivers/media/common/tuners |
12 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 12 | ccflags-y += -Idrivers/media/dvb/dvb-core |
13 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 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) |
diff --git a/drivers/media/video/cx25840/Makefile b/drivers/media/video/cx25840/Makefile index 2ee96d3973b8..dc40dde2e0c8 100644 --- a/drivers/media/video/cx25840/Makefile +++ b/drivers/media/video/cx25840/Makefile | |||
@@ -3,4 +3,4 @@ cx25840-objs := cx25840-core.o cx25840-audio.o cx25840-firmware.o \ | |||
3 | 3 | ||
4 | obj-$(CONFIG_VIDEO_CX25840) += cx25840.o | 4 | obj-$(CONFIG_VIDEO_CX25840) += cx25840.o |
5 | 5 | ||
6 | EXTRA_CFLAGS += -Idrivers/media/video | 6 | ccflags-y += -Idrivers/media/video |
diff --git a/drivers/media/video/cx88/Makefile b/drivers/media/video/cx88/Makefile index 5b7e26761f0a..c1a2785ba243 100644 --- a/drivers/media/video/cx88/Makefile +++ b/drivers/media/video/cx88/Makefile | |||
@@ -10,7 +10,7 @@ obj-$(CONFIG_VIDEO_CX88_BLACKBIRD) += cx88-blackbird.o | |||
10 | obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o | 10 | obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o |
11 | obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o | 11 | obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o |
12 | 12 | ||
13 | EXTRA_CFLAGS += -Idrivers/media/video | 13 | ccflags-y += -Idrivers/media/video |
14 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 14 | ccflags-y += -Idrivers/media/common/tuners |
15 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 15 | ccflags-y += -Idrivers/media/dvb/dvb-core |
16 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 16 | ccflags-y += -Idrivers/media/dvb/frontends |
diff --git a/drivers/media/video/em28xx/Makefile b/drivers/media/video/em28xx/Makefile index 38aaa004f57d..2abdf76c5203 100644 --- a/drivers/media/video/em28xx/Makefile +++ b/drivers/media/video/em28xx/Makefile | |||
@@ -9,8 +9,8 @@ obj-$(CONFIG_VIDEO_EM28XX) += em28xx.o | |||
9 | obj-$(CONFIG_VIDEO_EM28XX_ALSA) += em28xx-alsa.o | 9 | obj-$(CONFIG_VIDEO_EM28XX_ALSA) += em28xx-alsa.o |
10 | obj-$(CONFIG_VIDEO_EM28XX_DVB) += em28xx-dvb.o | 10 | obj-$(CONFIG_VIDEO_EM28XX_DVB) += em28xx-dvb.o |
11 | 11 | ||
12 | EXTRA_CFLAGS += -Idrivers/media/video | 12 | ccflags-y += -Idrivers/media/video |
13 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 13 | ccflags-y += -Idrivers/media/common/tuners |
14 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 14 | ccflags-y += -Idrivers/media/dvb/dvb-core |
15 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 15 | ccflags-y += -Idrivers/media/dvb/frontends |
16 | 16 | ||
diff --git a/drivers/media/video/gspca/gl860/Makefile b/drivers/media/video/gspca/gl860/Makefile index 13c9403cc87d..f511eccdfd9c 100644 --- a/drivers/media/video/gspca/gl860/Makefile +++ b/drivers/media/video/gspca/gl860/Makefile | |||
@@ -6,5 +6,5 @@ gspca_gl860-objs := gl860.o \ | |||
6 | gl860-ov9655.o \ | 6 | gl860-ov9655.o \ |
7 | gl860-mi2020.o | 7 | gl860-mi2020.o |
8 | 8 | ||
9 | EXTRA_CFLAGS += -Idrivers/media/video/gspca | 9 | ccflags-y += -Idrivers/media/video/gspca |
10 | 10 | ||
diff --git a/drivers/media/video/gspca/m5602/Makefile b/drivers/media/video/gspca/m5602/Makefile index bf7a19a1e6d1..7f52961f439c 100644 --- a/drivers/media/video/gspca/m5602/Makefile +++ b/drivers/media/video/gspca/m5602/Makefile | |||
@@ -8,4 +8,4 @@ gspca_m5602-objs := m5602_core.o \ | |||
8 | m5602_s5k83a.o \ | 8 | m5602_s5k83a.o \ |
9 | m5602_s5k4aa.o | 9 | m5602_s5k4aa.o |
10 | 10 | ||
11 | EXTRA_CFLAGS += -Idrivers/media/video/gspca | 11 | ccflags-y += -Idrivers/media/video/gspca |
diff --git a/drivers/media/video/gspca/stv06xx/Makefile b/drivers/media/video/gspca/stv06xx/Makefile index 2f3c3a606ce4..5b318faf9aa8 100644 --- a/drivers/media/video/gspca/stv06xx/Makefile +++ b/drivers/media/video/gspca/stv06xx/Makefile | |||
@@ -6,5 +6,5 @@ gspca_stv06xx-objs := stv06xx.o \ | |||
6 | stv06xx_pb0100.o \ | 6 | stv06xx_pb0100.o \ |
7 | stv06xx_st6422.o | 7 | stv06xx_st6422.o |
8 | 8 | ||
9 | EXTRA_CFLAGS += -Idrivers/media/video/gspca | 9 | ccflags-y += -Idrivers/media/video/gspca |
10 | 10 | ||
diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/video/hdpvr/Makefile index 3baa9f613ca3..52f057f24e39 100644 --- a/drivers/media/video/hdpvr/Makefile +++ b/drivers/media/video/hdpvr/Makefile | |||
@@ -2,6 +2,6 @@ hdpvr-objs := hdpvr-control.o hdpvr-core.o hdpvr-video.o hdpvr-i2c.o | |||
2 | 2 | ||
3 | obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o | 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) |
diff --git a/drivers/media/video/ivtv/Makefile b/drivers/media/video/ivtv/Makefile index 26ce0d6eaee1..71ab76a5ab26 100644 --- a/drivers/media/video/ivtv/Makefile +++ b/drivers/media/video/ivtv/Makefile | |||
@@ -7,8 +7,8 @@ ivtv-objs := ivtv-routing.o ivtv-cards.o ivtv-controls.o \ | |||
7 | obj-$(CONFIG_VIDEO_IVTV) += ivtv.o | 7 | obj-$(CONFIG_VIDEO_IVTV) += ivtv.o |
8 | obj-$(CONFIG_VIDEO_FB_IVTV) += ivtvfb.o | 8 | obj-$(CONFIG_VIDEO_FB_IVTV) += ivtvfb.o |
9 | 9 | ||
10 | EXTRA_CFLAGS += -Idrivers/media/video | 10 | ccflags-y += -Idrivers/media/video |
11 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 11 | ccflags-y += -Idrivers/media/common/tuners |
12 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 12 | ccflags-y += -Idrivers/media/dvb/dvb-core |
13 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 13 | ccflags-y += -Idrivers/media/dvb/frontends |
14 | 14 | ||
diff --git a/drivers/media/video/omap3isp/Makefile b/drivers/media/video/omap3isp/Makefile index b1b344774ae7..e8847e79e31a 100644 --- a/drivers/media/video/omap3isp/Makefile +++ b/drivers/media/video/omap3isp/Makefile | |||
@@ -1,8 +1,6 @@ | |||
1 | # Makefile for OMAP3 ISP driver | 1 | # Makefile for OMAP3 ISP driver |
2 | 2 | ||
3 | ifdef CONFIG_VIDEO_OMAP3_DEBUG | 3 | ccflags-$(CONFIG_VIDEO_OMAP3_DEBUG) += -DDEBUG |
4 | EXTRA_CFLAGS += -DDEBUG | ||
5 | endif | ||
6 | 4 | ||
7 | omap3-isp-objs += \ | 5 | omap3-isp-objs += \ |
8 | isp.o ispqueue.o ispvideo.o \ | 6 | isp.o ispqueue.o ispvideo.o \ |
diff --git a/drivers/media/video/pvrusb2/Makefile b/drivers/media/video/pvrusb2/Makefile index de2fc14f043b..c17f37d964ad 100644 --- a/drivers/media/video/pvrusb2/Makefile +++ b/drivers/media/video/pvrusb2/Makefile | |||
@@ -16,7 +16,7 @@ pvrusb2-objs := pvrusb2-i2c-core.o \ | |||
16 | 16 | ||
17 | obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o | 17 | obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o |
18 | 18 | ||
19 | EXTRA_CFLAGS += -Idrivers/media/video | 19 | ccflags-y += -Idrivers/media/video |
20 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 20 | ccflags-y += -Idrivers/media/common/tuners |
21 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 21 | ccflags-y += -Idrivers/media/dvb/dvb-core |
22 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 22 | ccflags-y += -Idrivers/media/dvb/frontends |
diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile index 8a5ff4d3cf15..a646ccf51696 100644 --- a/drivers/media/video/saa7134/Makefile +++ b/drivers/media/video/saa7134/Makefile | |||
@@ -10,7 +10,7 @@ obj-$(CONFIG_VIDEO_SAA7134_ALSA) += saa7134-alsa.o | |||
10 | 10 | ||
11 | obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o | 11 | obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o |
12 | 12 | ||
13 | EXTRA_CFLAGS += -Idrivers/media/video | 13 | ccflags-y += -Idrivers/media/video |
14 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 14 | ccflags-y += -Idrivers/media/common/tuners |
15 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 15 | ccflags-y += -Idrivers/media/dvb/dvb-core |
16 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 16 | ccflags-y += -Idrivers/media/dvb/frontends |
diff --git a/drivers/media/video/saa7164/Makefile b/drivers/media/video/saa7164/Makefile index 6303a8e60eac..ecd5811dc486 100644 --- a/drivers/media/video/saa7164/Makefile +++ b/drivers/media/video/saa7164/Makefile | |||
@@ -4,9 +4,9 @@ saa7164-objs := saa7164-cards.o saa7164-core.o saa7164-i2c.o saa7164-dvb.o \ | |||
4 | 4 | ||
5 | obj-$(CONFIG_VIDEO_SAA7164) += saa7164.o | 5 | obj-$(CONFIG_VIDEO_SAA7164) += saa7164.o |
6 | 6 | ||
7 | EXTRA_CFLAGS += -Idrivers/media/video | 7 | ccflags-y += -Idrivers/media/video |
8 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 8 | ccflags-y += -Idrivers/media/common/tuners |
9 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 9 | ccflags-y += -Idrivers/media/dvb/dvb-core |
10 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 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) |
diff --git a/drivers/media/video/tlg2300/Makefile b/drivers/media/video/tlg2300/Makefile index 81bb7fdd1e3d..ea09b9af2d30 100644 --- a/drivers/media/video/tlg2300/Makefile +++ b/drivers/media/video/tlg2300/Makefile | |||
@@ -2,8 +2,8 @@ poseidon-objs := pd-video.o pd-alsa.o pd-dvb.o pd-radio.o pd-main.o | |||
2 | 2 | ||
3 | obj-$(CONFIG_VIDEO_TLG2300) += poseidon.o | 3 | obj-$(CONFIG_VIDEO_TLG2300) += poseidon.o |
4 | 4 | ||
5 | EXTRA_CFLAGS += -Idrivers/media/video | 5 | ccflags-y += -Idrivers/media/video |
6 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 6 | ccflags-y += -Idrivers/media/common/tuners |
7 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 7 | ccflags-y += -Idrivers/media/dvb/dvb-core |
8 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 8 | ccflags-y += -Idrivers/media/dvb/frontends |
9 | 9 | ||
diff --git a/drivers/media/video/usbvision/Makefile b/drivers/media/video/usbvision/Makefile index 338718750945..aea1e3b5f06b 100644 --- a/drivers/media/video/usbvision/Makefile +++ b/drivers/media/video/usbvision/Makefile | |||
@@ -2,5 +2,5 @@ usbvision-objs := usbvision-core.o usbvision-video.o usbvision-i2c.o usbvision- | |||
2 | 2 | ||
3 | obj-$(CONFIG_VIDEO_USBVISION) += usbvision.o | 3 | obj-$(CONFIG_VIDEO_USBVISION) += usbvision.o |
4 | 4 | ||
5 | EXTRA_CFLAGS += -Idrivers/media/video | 5 | ccflags-y += -Idrivers/media/video |
6 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 6 | ccflags-y += -Idrivers/media/common/tuners |