diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-16 15:57:21 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-16 18:55:03 -0400 |
commit | 88f8472c9fc6c08f5113887471f1f4aabf7b2929 (patch) | |
tree | 0dabbb94ae8c88105e6605076b755dc4febbe029 | |
parent | 893430558e5bf116179915de2d3d119ad25c01cf (diff) |
[media] Fix some Makefile rules
On a few places, := were using instead of +=, causing drivers to
not compile.
While here, standardize the usage of += on all cases where multiple
lines are needed, and for obj-y/obj-m targets, and := when just one
line is needed, on <module>-obj rules.
Reported-by: Hans Verkuil <hverkuil@xs4all.nl>
Identified-by: Antti Polosaari <crope@iki.fi>
Tested-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/common/b2c2/Makefile | 5 | ||||
-rw-r--r-- | drivers/media/dvb-frontends/Makefile | 8 | ||||
-rw-r--r-- | drivers/media/firewire/Makefile | 2 | ||||
-rw-r--r-- | drivers/media/mmc/Makefile | 2 | ||||
-rw-r--r-- | drivers/media/pci/Makefile | 2 | ||||
-rw-r--r-- | drivers/media/pci/cx25821/Makefile | 2 | ||||
-rw-r--r-- | drivers/media/pci/saa7134/Makefile | 2 | ||||
-rw-r--r-- | drivers/media/platform/omap/Makefile | 2 | ||||
-rw-r--r-- | drivers/media/usb/Makefile | 4 | ||||
-rw-r--r-- | drivers/media/usb/b2c2/Makefile | 2 | ||||
-rw-r--r-- | drivers/media/usb/dvb-usb-v2/Makefile | 29 | ||||
-rw-r--r-- | drivers/media/usb/dvb-usb/Makefile | 53 | ||||
-rw-r--r-- | drivers/media/usb/em28xx/Makefile | 2 | ||||
-rw-r--r-- | drivers/media/usb/pwc/Makefile | 2 | ||||
-rw-r--r-- | drivers/media/usb/tm6000/Makefile | 2 |
15 files changed, 61 insertions, 58 deletions
diff --git a/drivers/media/common/b2c2/Makefile b/drivers/media/common/b2c2/Makefile index 48a4c906a173..24993a5b38ba 100644 --- a/drivers/media/common/b2c2/Makefile +++ b/drivers/media/common/b2c2/Makefile | |||
@@ -1,5 +1,6 @@ | |||
1 | b2c2-flexcop-objs = flexcop.o flexcop-fe-tuner.o flexcop-i2c.o \ | 1 | b2c2-flexcop-objs += flexcop.o flexcop-fe-tuner.o flexcop-i2c.o |
2 | flexcop-sram.o flexcop-eeprom.o flexcop-misc.o flexcop-hw-filter.o | 2 | b2c2-flexcop-objs += flexcop-sram.o flexcop-eeprom.o flexcop-misc.o |
3 | b2c2-flexcop-objs += flexcop-hw-filter.o | ||
3 | obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o | 4 | obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o |
4 | 5 | ||
5 | ccflags-y += -Idrivers/media/dvb-core/ | 6 | ccflags-y += -Idrivers/media/dvb-core/ |
diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile index 208bc496b90a..7eb73bbd2e26 100644 --- a/drivers/media/dvb-frontends/Makefile +++ b/drivers/media/dvb-frontends/Makefile | |||
@@ -5,10 +5,10 @@ | |||
5 | ccflags-y += -I$(srctree)/drivers/media/dvb-core/ | 5 | ccflags-y += -I$(srctree)/drivers/media/dvb-core/ |
6 | ccflags-y += -I$(srctree)/drivers/media/tuners/ | 6 | ccflags-y += -I$(srctree)/drivers/media/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 |
10 | drxd-objs = drxd_firm.o drxd_hard.o | 10 | drxd-objs := drxd_firm.o drxd_hard.o |
11 | cxd2820r-objs = cxd2820r_core.o cxd2820r_c.o cxd2820r_t.o cxd2820r_t2.o | 11 | cxd2820r-objs := cxd2820r_core.o cxd2820r_c.o cxd2820r_t.o cxd2820r_t2.o |
12 | drxk-objs := drxk_hard.o | 12 | drxk-objs := drxk_hard.o |
13 | 13 | ||
14 | obj-$(CONFIG_DVB_PLL) += dvb-pll.o | 14 | obj-$(CONFIG_DVB_PLL) += dvb-pll.o |
diff --git a/drivers/media/firewire/Makefile b/drivers/media/firewire/Makefile index f3148138c963..239481344d7c 100644 --- a/drivers/media/firewire/Makefile +++ b/drivers/media/firewire/Makefile | |||
@@ -1,6 +1,6 @@ | |||
1 | obj-$(CONFIG_DVB_FIREDTV) += firedtv.o | 1 | obj-$(CONFIG_DVB_FIREDTV) += firedtv.o |
2 | 2 | ||
3 | firedtv-y := firedtv-avc.o firedtv-ci.o firedtv-dvb.o firedtv-fe.o firedtv-fw.o | 3 | firedtv-y += firedtv-avc.o firedtv-ci.o firedtv-dvb.o firedtv-fe.o firedtv-fw.o |
4 | firedtv-$(CONFIG_DVB_FIREDTV_INPUT) += firedtv-rc.o | 4 | firedtv-$(CONFIG_DVB_FIREDTV_INPUT) += firedtv-rc.o |
5 | 5 | ||
6 | ccflags-y += -Idrivers/media/dvb-core | 6 | ccflags-y += -Idrivers/media/dvb-core |
diff --git a/drivers/media/mmc/Makefile b/drivers/media/mmc/Makefile index dacd3cbb80d6..31e297a202fb 100644 --- a/drivers/media/mmc/Makefile +++ b/drivers/media/mmc/Makefile | |||
@@ -1 +1 @@ | |||
obj-y := siano/ | obj-y += siano/ | ||
diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile index c8dc6c775303..35cc57862c01 100644 --- a/drivers/media/pci/Makefile +++ b/drivers/media/pci/Makefile | |||
@@ -2,7 +2,7 @@ | |||
2 | # Makefile for the kernel multimedia device drivers. | 2 | # Makefile for the kernel multimedia device drivers. |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := ttpci/ \ | 5 | obj-y += ttpci/ \ |
6 | b2c2/ \ | 6 | b2c2/ \ |
7 | pluto2/ \ | 7 | pluto2/ \ |
8 | dm1105/ \ | 8 | dm1105/ \ |
diff --git a/drivers/media/pci/cx25821/Makefile b/drivers/media/pci/cx25821/Makefile index c038941d6054..5bf3ea4c1556 100644 --- a/drivers/media/pci/cx25821/Makefile +++ b/drivers/media/pci/cx25821/Makefile | |||
@@ -7,7 +7,7 @@ cx25821-y := cx25821-core.o cx25821-cards.o cx25821-i2c.o \ | |||
7 | obj-$(CONFIG_VIDEO_CX25821) += cx25821.o | 7 | obj-$(CONFIG_VIDEO_CX25821) += cx25821.o |
8 | obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o | 8 | obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o |
9 | 9 | ||
10 | ccflags-y := -Idrivers/media/i2c | 10 | ccflags-y += -Idrivers/media/i2c |
11 | ccflags-y += -Idrivers/media/tuners | 11 | ccflags-y += -Idrivers/media/tuners |
12 | ccflags-y += -Idrivers/media/dvb-core | 12 | ccflags-y += -Idrivers/media/dvb-core |
13 | ccflags-y += -Idrivers/media/dvb-frontends | 13 | ccflags-y += -Idrivers/media/dvb-frontends |
diff --git a/drivers/media/pci/saa7134/Makefile b/drivers/media/pci/saa7134/Makefile index 9e510c1459f3..35375480ed4d 100644 --- a/drivers/media/pci/saa7134/Makefile +++ b/drivers/media/pci/saa7134/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | 1 | ||
2 | saa7134-y := saa7134-cards.o saa7134-core.o saa7134-i2c.o | 2 | saa7134-y += saa7134-cards.o saa7134-core.o saa7134-i2c.o |
3 | saa7134-y += saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o | 3 | saa7134-y += saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o |
4 | saa7134-y += saa7134-video.o | 4 | saa7134-y += saa7134-video.o |
5 | saa7134-$(CONFIG_VIDEO_SAA7134_RC) += saa7134-input.o | 5 | saa7134-$(CONFIG_VIDEO_SAA7134_RC) += saa7134-input.o |
diff --git a/drivers/media/platform/omap/Makefile b/drivers/media/platform/omap/Makefile index fc410b438f7d..d80df41fde28 100644 --- a/drivers/media/platform/omap/Makefile +++ b/drivers/media/platform/omap/Makefile | |||
@@ -3,6 +3,6 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | # OMAP2/3 Display driver | 5 | # OMAP2/3 Display driver |
6 | omap-vout-y := omap_vout.o omap_voutlib.o | 6 | omap-vout-y += omap_vout.o omap_voutlib.o |
7 | omap-vout-$(CONFIG_VIDEO_OMAP2_VOUT_VRFB) += omap_vout_vrfb.o | 7 | omap-vout-$(CONFIG_VIDEO_OMAP2_VOUT_VRFB) += omap_vout_vrfb.o |
8 | obj-$(CONFIG_VIDEO_OMAP2_VOUT) += omap-vout.o | 8 | obj-$(CONFIG_VIDEO_OMAP2_VOUT) += omap-vout.o |
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile index 63e37bb2ed74..7f51d7e5f739 100644 --- a/drivers/media/usb/Makefile +++ b/drivers/media/usb/Makefile | |||
@@ -3,8 +3,8 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | # DVB USB-only drivers | 5 | # DVB USB-only drivers |
6 | obj-y := ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ b2c2/ | 6 | obj-y += ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ b2c2/ |
7 | obj-y := zr364xx/ stkwebcam/ s2255/ | 7 | obj-y += zr364xx/ stkwebcam/ s2255/ |
8 | 8 | ||
9 | obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/ | 9 | obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/ |
10 | obj-$(CONFIG_USB_GSPCA) += gspca/ | 10 | obj-$(CONFIG_USB_GSPCA) += gspca/ |
diff --git a/drivers/media/usb/b2c2/Makefile b/drivers/media/usb/b2c2/Makefile index ace9d76f0b38..2778c19a45eb 100644 --- a/drivers/media/usb/b2c2/Makefile +++ b/drivers/media/usb/b2c2/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | b2c2-flexcop-usb-objs = flexcop-usb.o | 1 | b2c2-flexcop-usb-objs := flexcop-usb.o |
2 | obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o | 2 | obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o |
3 | 3 | ||
4 | ccflags-y += -Idrivers/media/dvb-core/ | 4 | ccflags-y += -Idrivers/media/dvb-core/ |
diff --git a/drivers/media/usb/dvb-usb-v2/Makefile b/drivers/media/usb/dvb-usb-v2/Makefile index 62568430418b..58027fd43a08 100644 --- a/drivers/media/usb/dvb-usb-v2/Makefile +++ b/drivers/media/usb/dvb-usb-v2/Makefile | |||
@@ -1,45 +1,46 @@ | |||
1 | dvb_usbv2-objs = dvb_usb_core.o dvb_usb_urb.o usb_urb.o | 1 | dvb_usbv2-objs := dvb_usb_core.o dvb_usb_urb.o usb_urb.o |
2 | obj-$(CONFIG_DVB_USB_V2) += dvb_usbv2.o | 2 | obj-$(CONFIG_DVB_USB_V2) += dvb_usbv2.o |
3 | 3 | ||
4 | dvb_usb_cypress_firmware-objs = cypress_firmware.o | 4 | dvb_usb_cypress_firmware-objs := cypress_firmware.o |
5 | obj-$(CONFIG_DVB_USB_CYPRESS_FIRMWARE) += dvb_usb_cypress_firmware.o | 5 | obj-$(CONFIG_DVB_USB_CYPRESS_FIRMWARE) += dvb_usb_cypress_firmware.o |
6 | 6 | ||
7 | dvb-usb-af9015-objs = af9015.o | 7 | dvb-usb-af9015-objs := af9015.o |
8 | obj-$(CONFIG_DVB_USB_AF9015) += dvb-usb-af9015.o | 8 | obj-$(CONFIG_DVB_USB_AF9015) += dvb-usb-af9015.o |
9 | 9 | ||
10 | dvb-usb-af9035-objs = af9035.o | 10 | dvb-usb-af9035-objs := af9035.o |
11 | obj-$(CONFIG_DVB_USB_AF9035) += dvb-usb-af9035.o | 11 | obj-$(CONFIG_DVB_USB_AF9035) += dvb-usb-af9035.o |
12 | 12 | ||
13 | dvb-usb-anysee-objs = anysee.o | 13 | dvb-usb-anysee-objs := anysee.o |
14 | obj-$(CONFIG_DVB_USB_ANYSEE) += dvb-usb-anysee.o | 14 | obj-$(CONFIG_DVB_USB_ANYSEE) += dvb-usb-anysee.o |
15 | 15 | ||
16 | dvb-usb-au6610-objs = au6610.o | 16 | dvb-usb-au6610-objs := au6610.o |
17 | obj-$(CONFIG_DVB_USB_AU6610) += dvb-usb-au6610.o | 17 | obj-$(CONFIG_DVB_USB_AU6610) += dvb-usb-au6610.o |
18 | 18 | ||
19 | dvb-usb-az6007-objs = az6007.o | 19 | dvb-usb-az6007-objs := az6007.o |
20 | obj-$(CONFIG_DVB_USB_AZ6007) += dvb-usb-az6007.o | 20 | obj-$(CONFIG_DVB_USB_AZ6007) += dvb-usb-az6007.o |
21 | 21 | ||
22 | dvb-usb-ce6230-objs = ce6230.o | 22 | dvb-usb-ce6230-objs := ce6230.o |
23 | obj-$(CONFIG_DVB_USB_CE6230) += dvb-usb-ce6230.o | 23 | obj-$(CONFIG_DVB_USB_CE6230) += dvb-usb-ce6230.o |
24 | 24 | ||
25 | dvb-usb-ec168-objs = ec168.o | 25 | dvb-usb-ec168-objs := ec168.o |
26 | obj-$(CONFIG_DVB_USB_EC168) += dvb-usb-ec168.o | 26 | obj-$(CONFIG_DVB_USB_EC168) += dvb-usb-ec168.o |
27 | 27 | ||
28 | dvb-usb-it913x-objs = it913x.o | 28 | dvb-usb-it913x-objs := it913x.o |
29 | obj-$(CONFIG_DVB_USB_IT913X) += dvb-usb-it913x.o | 29 | obj-$(CONFIG_DVB_USB_IT913X) += dvb-usb-it913x.o |
30 | 30 | ||
31 | dvb-usb-lmedm04-objs = lmedm04.o | 31 | dvb-usb-lmedm04-objs := lmedm04.o |
32 | obj-$(CONFIG_DVB_USB_LME2510) += dvb-usb-lmedm04.o | 32 | obj-$(CONFIG_DVB_USB_LME2510) += dvb-usb-lmedm04.o |
33 | 33 | ||
34 | dvb-usb-gl861-objs = gl861.o | 34 | dvb-usb-gl861-objs := gl861.o |
35 | obj-$(CONFIG_DVB_USB_GL861) += dvb-usb-gl861.o | 35 | obj-$(CONFIG_DVB_USB_GL861) += dvb-usb-gl861.o |
36 | 36 | ||
37 | dvb-usb-mxl111sf-objs = mxl111sf.o mxl111sf-phy.o mxl111sf-i2c.o mxl111sf-gpio.o | 37 | dvb-usb-mxl111sf-objs += mxl111sf.o mxl111sf-phy.o mxl111sf-i2c.o |
38 | dvb-usb-mxl111sf-objs += mxl111sf-gpio.o | ||
38 | obj-$(CONFIG_DVB_USB_MXL111SF) += dvb-usb-mxl111sf.o | 39 | obj-$(CONFIG_DVB_USB_MXL111SF) += dvb-usb-mxl111sf.o |
39 | obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-demod.o | 40 | obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-demod.o |
40 | obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-tuner.o | 41 | obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-tuner.o |
41 | 42 | ||
42 | dvb-usb-rtl28xxu-objs = rtl28xxu.o | 43 | dvb-usb-rtl28xxu-objs := rtl28xxu.o |
43 | obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o | 44 | obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o |
44 | 45 | ||
45 | ccflags-y += -I$(srctree)/drivers/media/dvb-core | 46 | ccflags-y += -I$(srctree)/drivers/media/dvb-core |
diff --git a/drivers/media/usb/dvb-usb/Makefile b/drivers/media/usb/dvb-usb/Makefile index d3ab1e74647d..acdd1efd4e74 100644 --- a/drivers/media/usb/dvb-usb/Makefile +++ b/drivers/media/usb/dvb-usb/Makefile | |||
@@ -1,78 +1,79 @@ | |||
1 | dvb-usb-objs = dvb-usb-firmware.o dvb-usb-init.o dvb-usb-urb.o dvb-usb-i2c.o dvb-usb-dvb.o dvb-usb-remote.o usb-urb.o | 1 | dvb-usb-objs += dvb-usb-firmware.o dvb-usb-init.o dvb-usb-urb.o dvb-usb-i2c.o |
2 | dvb-usb-objs += dvb-usb-dvb.o dvb-usb-remote.o usb-urb.o | ||
2 | obj-$(CONFIG_DVB_USB) += dvb-usb.o | 3 | obj-$(CONFIG_DVB_USB) += dvb-usb.o |
3 | 4 | ||
4 | dvb-usb-vp7045-objs = vp7045.o vp7045-fe.o | 5 | dvb-usb-vp7045-objs := vp7045.o vp7045-fe.o |
5 | obj-$(CONFIG_DVB_USB_VP7045) += dvb-usb-vp7045.o | 6 | obj-$(CONFIG_DVB_USB_VP7045) += dvb-usb-vp7045.o |
6 | 7 | ||
7 | dvb-usb-vp702x-objs = vp702x.o vp702x-fe.o | 8 | dvb-usb-vp702x-objs := vp702x.o vp702x-fe.o |
8 | obj-$(CONFIG_DVB_USB_VP702X) += dvb-usb-vp702x.o | 9 | obj-$(CONFIG_DVB_USB_VP702X) += dvb-usb-vp702x.o |
9 | 10 | ||
10 | dvb-usb-gp8psk-objs = gp8psk.o gp8psk-fe.o | 11 | dvb-usb-gp8psk-objs := gp8psk.o gp8psk-fe.o |
11 | obj-$(CONFIG_DVB_USB_GP8PSK) += dvb-usb-gp8psk.o | 12 | obj-$(CONFIG_DVB_USB_GP8PSK) += dvb-usb-gp8psk.o |
12 | 13 | ||
13 | dvb-usb-dtt200u-objs = dtt200u.o dtt200u-fe.o | 14 | dvb-usb-dtt200u-objs := dtt200u.o dtt200u-fe.o |
14 | obj-$(CONFIG_DVB_USB_DTT200U) += dvb-usb-dtt200u.o | 15 | obj-$(CONFIG_DVB_USB_DTT200U) += dvb-usb-dtt200u.o |
15 | 16 | ||
16 | dvb-usb-dibusb-common-objs = dibusb-common.o | 17 | dvb-usb-dibusb-common-objs := dibusb-common.o |
17 | 18 | ||
18 | dvb-usb-a800-objs = a800.o | 19 | dvb-usb-a800-objs := a800.o |
19 | obj-$(CONFIG_DVB_USB_A800) += dvb-usb-dibusb-common.o dvb-usb-a800.o | 20 | obj-$(CONFIG_DVB_USB_A800) += dvb-usb-dibusb-common.o dvb-usb-a800.o |
20 | 21 | ||
21 | dvb-usb-dibusb-mb-objs = dibusb-mb.o | 22 | dvb-usb-dibusb-mb-objs := dibusb-mb.o |
22 | obj-$(CONFIG_DVB_USB_DIBUSB_MB) += dvb-usb-dibusb-common.o dvb-usb-dibusb-mb.o | 23 | obj-$(CONFIG_DVB_USB_DIBUSB_MB) += dvb-usb-dibusb-common.o dvb-usb-dibusb-mb.o |
23 | 24 | ||
24 | dvb-usb-dibusb-mc-objs = dibusb-mc.o | 25 | dvb-usb-dibusb-mc-objs := dibusb-mc.o |
25 | obj-$(CONFIG_DVB_USB_DIBUSB_MC) += dvb-usb-dibusb-common.o dvb-usb-dibusb-mc.o | 26 | obj-$(CONFIG_DVB_USB_DIBUSB_MC) += dvb-usb-dibusb-common.o dvb-usb-dibusb-mc.o |
26 | 27 | ||
27 | dvb-usb-nova-t-usb2-objs = nova-t-usb2.o | 28 | dvb-usb-nova-t-usb2-objs := nova-t-usb2.o |
28 | obj-$(CONFIG_DVB_USB_NOVA_T_USB2) += dvb-usb-dibusb-common.o dvb-usb-nova-t-usb2.o | 29 | obj-$(CONFIG_DVB_USB_NOVA_T_USB2) += dvb-usb-dibusb-common.o dvb-usb-nova-t-usb2.o |
29 | 30 | ||
30 | dvb-usb-umt-010-objs = umt-010.o | 31 | dvb-usb-umt-010-objs := umt-010.o |
31 | obj-$(CONFIG_DVB_USB_UMT_010) += dvb-usb-dibusb-common.o dvb-usb-umt-010.o | 32 | obj-$(CONFIG_DVB_USB_UMT_010) += dvb-usb-dibusb-common.o dvb-usb-umt-010.o |
32 | 33 | ||
33 | dvb-usb-m920x-objs = m920x.o | 34 | dvb-usb-m920x-objs := m920x.o |
34 | obj-$(CONFIG_DVB_USB_M920X) += dvb-usb-m920x.o | 35 | obj-$(CONFIG_DVB_USB_M920X) += dvb-usb-m920x.o |
35 | 36 | ||
36 | dvb-usb-digitv-objs = digitv.o | 37 | dvb-usb-digitv-objs := digitv.o |
37 | obj-$(CONFIG_DVB_USB_DIGITV) += dvb-usb-digitv.o | 38 | obj-$(CONFIG_DVB_USB_DIGITV) += dvb-usb-digitv.o |
38 | 39 | ||
39 | dvb-usb-cxusb-objs = cxusb.o | 40 | dvb-usb-cxusb-objs := cxusb.o |
40 | obj-$(CONFIG_DVB_USB_CXUSB) += dvb-usb-cxusb.o | 41 | obj-$(CONFIG_DVB_USB_CXUSB) += dvb-usb-cxusb.o |
41 | 42 | ||
42 | dvb-usb-ttusb2-objs = ttusb2.o | 43 | dvb-usb-ttusb2-objs := ttusb2.o |
43 | obj-$(CONFIG_DVB_USB_TTUSB2) += dvb-usb-ttusb2.o | 44 | obj-$(CONFIG_DVB_USB_TTUSB2) += dvb-usb-ttusb2.o |
44 | 45 | ||
45 | dvb-usb-dib0700-objs = dib0700_core.o dib0700_devices.o | 46 | dvb-usb-dib0700-objs := dib0700_core.o dib0700_devices.o |
46 | obj-$(CONFIG_DVB_USB_DIB0700) += dvb-usb-dib0700.o | 47 | obj-$(CONFIG_DVB_USB_DIB0700) += dvb-usb-dib0700.o |
47 | 48 | ||
48 | dvb-usb-opera-objs = opera1.o | 49 | dvb-usb-opera-objs := opera1.o |
49 | obj-$(CONFIG_DVB_USB_OPERA1) += dvb-usb-opera.o | 50 | obj-$(CONFIG_DVB_USB_OPERA1) += dvb-usb-opera.o |
50 | 51 | ||
51 | dvb-usb-af9005-objs = af9005.o af9005-fe.o | 52 | dvb-usb-af9005-objs := af9005.o af9005-fe.o |
52 | obj-$(CONFIG_DVB_USB_AF9005) += dvb-usb-af9005.o | 53 | obj-$(CONFIG_DVB_USB_AF9005) += dvb-usb-af9005.o |
53 | 54 | ||
54 | dvb-usb-af9005-remote-objs = af9005-remote.o | 55 | dvb-usb-af9005-remote-objs := af9005-remote.o |
55 | obj-$(CONFIG_DVB_USB_AF9005_REMOTE) += dvb-usb-af9005-remote.o | 56 | obj-$(CONFIG_DVB_USB_AF9005_REMOTE) += dvb-usb-af9005-remote.o |
56 | 57 | ||
57 | dvb-usb-pctv452e-objs = pctv452e.o | 58 | dvb-usb-pctv452e-objs := pctv452e.o |
58 | obj-$(CONFIG_DVB_USB_PCTV452E) += dvb-usb-pctv452e.o | 59 | obj-$(CONFIG_DVB_USB_PCTV452E) += dvb-usb-pctv452e.o |
59 | 60 | ||
60 | dvb-usb-dw2102-objs = dw2102.o | 61 | dvb-usb-dw2102-objs := dw2102.o |
61 | obj-$(CONFIG_DVB_USB_DW2102) += dvb-usb-dw2102.o | 62 | obj-$(CONFIG_DVB_USB_DW2102) += dvb-usb-dw2102.o |
62 | 63 | ||
63 | dvb-usb-dtv5100-objs = dtv5100.o | 64 | dvb-usb-dtv5100-objs := dtv5100.o |
64 | obj-$(CONFIG_DVB_USB_DTV5100) += dvb-usb-dtv5100.o | 65 | obj-$(CONFIG_DVB_USB_DTV5100) += dvb-usb-dtv5100.o |
65 | 66 | ||
66 | dvb-usb-cinergyT2-objs = cinergyT2-core.o cinergyT2-fe.o | 67 | dvb-usb-cinergyT2-objs := cinergyT2-core.o cinergyT2-fe.o |
67 | obj-$(CONFIG_DVB_USB_CINERGY_T2) += dvb-usb-cinergyT2.o | 68 | obj-$(CONFIG_DVB_USB_CINERGY_T2) += dvb-usb-cinergyT2.o |
68 | 69 | ||
69 | dvb-usb-friio-objs = friio.o friio-fe.o | 70 | dvb-usb-friio-objs := friio.o friio-fe.o |
70 | obj-$(CONFIG_DVB_USB_FRIIO) += dvb-usb-friio.o | 71 | obj-$(CONFIG_DVB_USB_FRIIO) += dvb-usb-friio.o |
71 | 72 | ||
72 | dvb-usb-az6027-objs = az6027.o | 73 | dvb-usb-az6027-objs := az6027.o |
73 | obj-$(CONFIG_DVB_USB_AZ6027) += dvb-usb-az6027.o | 74 | obj-$(CONFIG_DVB_USB_AZ6027) += dvb-usb-az6027.o |
74 | 75 | ||
75 | dvb-usb-technisat-usb2-objs = technisat-usb2.o | 76 | dvb-usb-technisat-usb2-objs := technisat-usb2.o |
76 | obj-$(CONFIG_DVB_USB_TECHNISAT_USB2) += dvb-usb-technisat-usb2.o | 77 | obj-$(CONFIG_DVB_USB_TECHNISAT_USB2) += dvb-usb-technisat-usb2.o |
77 | 78 | ||
78 | ccflags-y += -I$(srctree)/drivers/media/dvb-core | 79 | ccflags-y += -I$(srctree)/drivers/media/dvb-core |
diff --git a/drivers/media/usb/em28xx/Makefile b/drivers/media/usb/em28xx/Makefile index 6c5f3381da7d..634fb920dd39 100644 --- a/drivers/media/usb/em28xx/Makefile +++ b/drivers/media/usb/em28xx/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | em28xx-y := em28xx-video.o em28xx-i2c.o em28xx-cards.o | 1 | em28xx-y += em28xx-video.o em28xx-i2c.o em28xx-cards.o |
2 | em28xx-y += em28xx-core.o em28xx-vbi.o | 2 | em28xx-y += em28xx-core.o em28xx-vbi.o |
3 | 3 | ||
4 | em28xx-alsa-objs := em28xx-audio.o | 4 | em28xx-alsa-objs := em28xx-audio.o |
diff --git a/drivers/media/usb/pwc/Makefile b/drivers/media/usb/pwc/Makefile index f5c8ec261e87..d7fdbcb9edd3 100644 --- a/drivers/media/usb/pwc/Makefile +++ b/drivers/media/usb/pwc/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-v4l.o pwc-uncompress.o | 1 | pwc-objs += pwc-if.o pwc-misc.o pwc-ctrl.o pwc-v4l.o pwc-uncompress.o |
2 | pwc-objs += pwc-dec1.o pwc-dec23.o pwc-kiara.o pwc-timon.o | 2 | pwc-objs += pwc-dec1.o pwc-dec23.o pwc-kiara.o pwc-timon.o |
3 | 3 | ||
4 | obj-$(CONFIG_USB_PWC) += pwc.o | 4 | obj-$(CONFIG_USB_PWC) += pwc.o |
diff --git a/drivers/media/usb/tm6000/Makefile b/drivers/media/usb/tm6000/Makefile index 6fa1f1044512..f2644933b8d1 100644 --- a/drivers/media/usb/tm6000/Makefile +++ b/drivers/media/usb/tm6000/Makefile | |||
@@ -9,7 +9,7 @@ obj-$(CONFIG_VIDEO_TM6000) += tm6000.o | |||
9 | obj-$(CONFIG_VIDEO_TM6000_ALSA) += tm6000-alsa.o | 9 | obj-$(CONFIG_VIDEO_TM6000_ALSA) += tm6000-alsa.o |
10 | obj-$(CONFIG_VIDEO_TM6000_DVB) += tm6000-dvb.o | 10 | obj-$(CONFIG_VIDEO_TM6000_DVB) += tm6000-dvb.o |
11 | 11 | ||
12 | ccflags-y := -Idrivers/media/i2c | 12 | ccflags-y += -Idrivers/media/i2c |
13 | ccflags-y += -Idrivers/media/tuners | 13 | ccflags-y += -Idrivers/media/tuners |
14 | ccflags-y += -Idrivers/media/dvb-core | 14 | ccflags-y += -Idrivers/media/dvb-core |
15 | ccflags-y += -Idrivers/media/dvb-frontends | 15 | ccflags-y += -Idrivers/media/dvb-frontends |