Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f5c14d3 authored by Arnaud Lacombe's avatar Arnaud Lacombe Committed by Mauro Carvalho Chehab
Browse files

[media] drivers/media: do not use EXTRA_CFLAGS 



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

    commit f77bf014
    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: default avatarArnaud Lacombe <lacombar@gmail.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 63f409a4

drivers/media/common/tuners/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -28,5 +28,5 @@ obj-$(CONFIG_MEDIA_TUNER_MAX2165) += max2165.o 
obj-$(CONFIG_MEDIA_TUNER_TDA18218) += tda18218.o

obj-$(CONFIG_MEDIA_TUNER_TDA18212) += tda18212.o



EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core

EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
 
ccflags-y += -Idrivers/media/dvb/dvb-core

ccflags-y += -Idrivers/media/dvb/frontends

drivers/media/dvb/b2c2/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -12,5 +12,5 @@ obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o 
b2c2-flexcop-usb-objs = flexcop-usb.o

obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o



EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/

EXTRA_CFLAGS += -Idrivers/media/common/tuners/
 
ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/

ccflags-y += -Idrivers/media/common/tuners/

drivers/media/dvb/bt8xx/Makefile

+4 −4
Original line number Diff line number Diff line 
obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o



EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core

EXTRA_CFLAGS += -Idrivers/media/dvb/frontends

EXTRA_CFLAGS += -Idrivers/media/video/bt8xx

EXTRA_CFLAGS += -Idrivers/media/common/tuners
 
ccflags-y += -Idrivers/media/dvb/dvb-core

ccflags-y += -Idrivers/media/dvb/frontends

ccflags-y += -Idrivers/media/video/bt8xx

ccflags-y += -Idrivers/media/common/tuners

drivers/media/dvb/ddbridge/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ ddbridge-objs := ddbridge-core.o 


obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o



EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/

EXTRA_CFLAGS += -Idrivers/media/dvb/frontends/

EXTRA_CFLAGS += -Idrivers/media/common/tuners/

ccflags-y += -Idrivers/media/dvb/dvb-core/

ccflags-y += -Idrivers/media/dvb/frontends/

ccflags-y += -Idrivers/media/common/tuners/



# For the staging CI driver cxd2099

EXTRA_CFLAGS += -Idrivers/staging/cxd2099/
 
ccflags-y += -Idrivers/staging/cxd2099/

drivers/media/dvb/dm1105/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_DVB_DM1105) += dm1105.o



EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends
 
ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends