media: video: append $(srctree) to -I parameters

PATCH Superseded Andy Shevchenko 2 participants 11 messages Feb 15, 2012 – Feb 17, 2012 Media (V4L/DVB)

Share & tools

Andy Shevchenko

author

2012-02-15 15:08 UTC #0 lore raw

PATCH 1/1 media: video: append $(srctree) to -I parameters

Without this we have got the warnings like following if build with "make W=1 O=/var/tmp":
CHECK drivers/media/video/videobuf-vmalloc.c
CC [M] drivers/media/video/videobuf-vmalloc.o
+cc1: warning: drivers/media/dvb/dvb-core: No such file or directory [enabled by default] +cc1: warning: drivers/media/dvb/frontends: No such file or directory [enabled by default] +cc1: warning: drivers/media/dvb/dvb-core: No such file or directory [enabled by default] +cc1: warning: drivers/media/dvb/frontends: No such file or directory [enabled by default]
LD drivers/media/built-in.o

Some details could be found in [1] as well.

[1] http://comments.gmane.org/gmane.linux.kbuild.devel/7733

Signed-off-by Andy Shevchenko <[email protected]>

---
 drivers/media/video/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

drivers/media/video/Makefile +3 -3

index 3541388..3bf0aa8 100644
@@ -199,6 +199,6 @@ obj-y	+= davinci/
 
 obj-$(CONFIG_ARCH_OMAP)	+= omap/
 
-ccflags-y += -Idrivers/media/dvb/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
+ccflags-y += -I$(srctree)/drivers/media/common/tuners

Signature · 1 line

1.7.9

Laurent Pinchart

2012-02-16 06:22 UTC #1 lore raw

Hi Andy,

Thanks for the patch.

Quoted 11 lines · On Wednesday 15 February 2012 17:08:01 Andy Shevchenko wrote:

Without this we have got the warnings like following if build with "make W=1 O=/var/tmp":
CHECK drivers/media/video/videobuf-vmalloc.c
CC [M] drivers/media/video/videobuf-vmalloc.o
+cc1: warning: drivers/media/dvb/dvb-core: No such file or directory
[enabled by default] +cc1: warning: drivers/media/dvb/frontends: No such file or directory [enabled by default] +cc1: warning:
drivers/media/dvb/dvb-core: No such file or directory [enabled by default] +cc1: warning: drivers/media/dvb/frontends: No such file or directory
[enabled by default] LD drivers/media/built-in.o

Quoted 3 lines

Some details could be found in [1] as well.
[1] http://comments.gmane.org/gmane.linux.kbuild.devel/7733

There are several occurencies if the same issue throughout drivers/. Could you send a patch that fixes them all in one go ?

Quoted 10 lines

Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/media/video/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/media/video/Makefile +0 -0
index 3541388..3bf0aa8 100644

drivers/media/video/Makefile obj-y += davinci/ · line 204

Quoted 9 lines

drivers/media/video/Makefile +3 -3

@@ -199,6 +199,6 @@ obj-y	+= davinci/
 
 obj-$(CONFIG_ARCH_OMAP)	+= omap/
 
-ccflags-y += -Idrivers/media/dvb/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
+ccflags-y += -I$(srctree)/drivers/media/common/tuners

The above link mentions $(src). Is that different than $(srctree) ?

Signature · 3 lines

Regards,

Laurent Pinchart

Andy Shevchenko

author

2012-02-16 09:57 UTC #2 lore raw

Quoted 16 lines · Laurent Pinchart

Hi Andy,
Thanks for the patch.
Quoted 11 lines · On Wednesday 15 February 2012 17:08:01 Andy Shevchenko wrote:
Without this we have got the warnings like following if build with "make W=1 O=/var/tmp":
CHECK drivers/media/video/videobuf-vmalloc.c
CC [M] drivers/media/video/videobuf-vmalloc.o
+cc1: warning: drivers/media/dvb/dvb-core: No such file or directory
[enabled by default] +cc1: warning: drivers/media/dvb/frontends: No such file or directory [enabled by default] +cc1: warning:
drivers/media/dvb/dvb-core: No such file or directory [enabled by default] +cc1: warning: drivers/media/dvb/frontends: No such file or directory
[enabled by default] LD drivers/media/built-in.o

Quoted 6 lines

Quoted 3 lines
Some details could be found in [1] as well.
[1] http://comments.gmane.org/gmane.linux.kbuild.devel/7733
There are several occurencies if the same issue throughout drivers/. Could you send a patch that fixes them all in one go ?

I guess it should be a patch series anyway to help with bisecting. Okay, I will check it and make a patches if there any issue is found.

Quoted 13 lines

Quoted 13 lines
Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/media/video/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/media/video/Makefile +0 -0
index 3541388..3bf0aa8 100644
@@ -199,6 +199,6 @@ obj-y	+= davinci/
 
 obj-$(CONFIG_ARCH_OMAP)	+= omap/
 

Quoted 8 lines

drivers/media/video/Makefile obj-y += davinci/ · line 204
Quoted 6 lines
drivers/media/video/Makefile +3 -3
-ccflags-y += -Idrivers/media/dvb/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
+ccflags-y += -I$(srctree)/drivers/media/common/tuners
The above link mentions $(src). Is that different than $(srctree) ?

If I remember correctly $srctree points always to the root of the linux kernel sources, but $src to the path of a certain Makefile. In this case it seems $(src) == drivers/media/video.

Moment...

Aha, the Documentation/kbuild/makefiles.txt clearly tells us:

    $(src)
        $(src) is a relative path which points to the directory
        where the Makefile is located. Always use $(src) when
        referring to files located in the src tree.

Signature · 2 lines

Andy Shevchenko <[email protected]>
Intel Finland Oy

Andy Shevchenko

author

2012-02-17 08:57 UTC #3 lore raw

PATCH v2 1/7 media: video: append $(srctree) to -I parameters

In reply to Laurent Pinchart

Some details could be found in [1] as well.

[1] http://comments.gmane.org/gmane.linux.kbuild.devel/7733

Signed-off-by Andy Shevchenko <[email protected]>

---
 drivers/media/video/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

drivers/media/video/Makefile +3 -3

index 3541388..3bf0aa8 100644
@@ -199,6 +199,6 @@ obj-y	+= davinci/
 
 obj-$(CONFIG_ARCH_OMAP)	+= omap/
 
-ccflags-y += -Idrivers/media/dvb/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
+ccflags-y += -I$(srctree)/drivers/media/common/tuners

Signature · 1 line

1.7.9

Andy Shevchenko

author

2012-02-17 08:57 UTC #4 lore raw

PATCH v2 2/7 media: tuners: append $(srctree) to -I parameters

Without this we have got the warnings like following if build with "make W=1 O=/var/tmp":
cc1: warning: drivers/media/dvb/dvb-core: No such file or directory [enabled by default]

Signed-off-by Andy Shevchenko <[email protected]>

---
 drivers/media/common/tuners/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/media/common/tuners/Makefile +2 -2

index 8295854..f80407e 100644
@@ -29,5 +29,5 @@ obj-$(CONFIG_MEDIA_TUNER_MAX2165) += max2165.o
 obj-$(CONFIG_MEDIA_TUNER_TDA18218) += tda18218.o
 obj-$(CONFIG_MEDIA_TUNER_TDA18212) += tda18212.o
 
-ccflags-y += -Idrivers/media/dvb/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb/frontends

Signature · 1 line

1.7.9

Andy Shevchenko

author

2012-02-17 08:57 UTC #5 lore raw

PATCH v2 3/7 media: gspca: append $(srctree) to -I parameters

In reply to Andy Shevchenko

Without this we have got the warnings like following if build with "make W=1 O=/var/tmp":
cc1: warning: drivers/media/dvb/dvb-core: No such file or directory [enabled by default]

Signed-off-by Andy Shevchenko <[email protected]>

---
 drivers/media/video/gspca/gl860/Makefile   |    2 +-
 drivers/media/video/gspca/m5602/Makefile   |    2 +-
 drivers/media/video/gspca/stv06xx/Makefile |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

drivers/media/video/gspca/gl860/Makefile +1 -1

index f511ecc..773ea34 100644
@@ -6,5 +6,5 @@ gspca_gl860-objs := gl860.o \
 		    gl860-ov9655.o \
 		    gl860-mi2020.o
 
-ccflags-y += -Idrivers/media/video/gspca
+ccflags-y += -I$(srctree)/drivers/media/video/gspca

drivers/media/video/gspca/m5602/Makefile +1 -1

index 7f52961..575b75b 100644
@@ -8,4 +8,4 @@ gspca_m5602-objs := m5602_core.o \
 		    m5602_s5k83a.o \
 		    m5602_s5k4aa.o
 
-ccflags-y += -Idrivers/media/video/gspca
+ccflags-y += -I$(srctree)/drivers/media/video/gspca

drivers/media/video/gspca/stv06xx/Makefile +1 -1

index 5b318fa..38bc410 100644
@@ -6,5 +6,5 @@ gspca_stv06xx-objs := stv06xx.o \
 		      stv06xx_pb0100.o \
 		      stv06xx_st6422.o
 
-ccflags-y += -Idrivers/media/video/gspca
+ccflags-y += -I$(srctree)/drivers/media/video/gspca

Signature · 1 line

1.7.9

Andy Shevchenko

author

2012-02-17 08:57 UTC #6 lore raw

PATCH v2 4/7 media: dvb: append $(srctree) to -I parameters

In reply to Andy Shevchenko

Without this we have got the warnings like following if build with "make W=1 O=/var/tmp":
cc1: warning: drivers/media/dvb/dvb-core: No such file or directory [enabled by default]

Signed-off-by Andy Shevchenko <[email protected]>

---
 drivers/media/dvb/dvb-usb/Makefile   |    7 ++++---
 drivers/media/dvb/frontends/Makefile |    4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

drivers/media/dvb/dvb-usb/Makefile +4 -3

index d9549cb..2e64f84 100644
@@ -107,8 +107,9 @@ obj-$(CONFIG_DVB_USB_MXL111SF) += dvb-usb-mxl111sf.o
 obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-demod.o
 obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-tuner.o
 
-ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
+ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb/frontends/
 # due to tuner-xc3028
-ccflags-y += -Idrivers/media/common/tuners
-EXTRA_CFLAGS += -Idrivers/media/dvb/ttpci
+ccflags-y += -I$(srctree)/drivers/media/common/tuners
+ccflags-y += -I$(srctree)/drivers/media/dvb/ttpci

drivers/media/dvb/frontends/Makefile +2 -2

index 00a2063..90320f1 100644
@@ -2,8 +2,8 @@
 # Makefile for the kernel DVB frontend device drivers.
 #
 
-ccflags-y += -Idrivers/media/dvb/dvb-core/
-ccflags-y += -Idrivers/media/common/tuners/
+ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core/
+ccflags-y += -I$(srctree)/drivers/media/common/tuners/
 
 stb0899-objs = stb0899_drv.o stb0899_algo.o
 stv0900-objs = stv0900_core.o stv0900_sw.o

Signature · 1 line

1.7.9

Andy Shevchenko

author

2012-02-17 08:57 UTC #7 lore raw

PATCH v2 5/7 media: ivtv: append $(srctree) to -I parameters

In reply to Andy Shevchenko

Without this we have got the warnings like following if build with "make W=1 O=/var/tmp":
cc1: warning: drivers/media/dvb/dvb-core: No such file or directory [enabled by default]

Signed-off-by Andy Shevchenko <[email protected]>

---
 drivers/media/video/ivtv/Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

drivers/media/video/ivtv/Makefile +4 -4

index 71ab76a..77de8a4 100644
@@ -7,8 +7,8 @@ ivtv-objs	:= ivtv-routing.o ivtv-cards.o ivtv-controls.o \
 obj-$(CONFIG_VIDEO_IVTV) += ivtv.o
 obj-$(CONFIG_VIDEO_FB_IVTV) += ivtvfb.o
 
-ccflags-y += -Idrivers/media/video
-ccflags-y += -Idrivers/media/common/tuners
-ccflags-y += -Idrivers/media/dvb/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -I$(srctree)/drivers/media/video
+ccflags-y += -I$(srctree)/drivers/media/common/tuners
+ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb/frontends

Signature · 1 line

1.7.9

Andy Shevchenko

author

2012-02-17 08:57 UTC #8 lore raw

PATCH v2 6/7 media: saa7164: append $(srctree) to -I parameters

In reply to Andy Shevchenko

Without this we have got the warnings like following if build with "make W=1 O=/var/tmp":
cc1: warning: drivers/media/dvb/dvb-core: No such file or directory [enabled by default]

Signed-off-by Andy Shevchenko <[email protected]>

---
 drivers/media/video/saa7164/Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

drivers/media/video/saa7164/Makefile +4 -4

index ecd5811..068443a 100644
@@ -4,9 +4,9 @@ saa7164-objs	:= saa7164-cards.o saa7164-core.o saa7164-i2c.o saa7164-dvb.o \
 
 obj-$(CONFIG_VIDEO_SAA7164) += saa7164.o
 
-ccflags-y += -Idrivers/media/video
-ccflags-y += -Idrivers/media/common/tuners
-ccflags-y += -Idrivers/media/dvb/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -I$(srctree)/drivers/media/video
+ccflags-y += -I$(srctree)/drivers/media/common/tuners
+ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
 
 ccflags-y += $(extra-cflags-y) $(extra-cflags-m)

Signature · 1 line

1.7.9

Andy Shevchenko

author

2012-02-17 08:57 UTC #9 lore raw

PATCH v2 7/7 media: saa7134: append $(srctree) to -I parameters

In reply to Andy Shevchenko

Without this we have got the warnings like following if build with "make W=1 O=/var/tmp":
cc1: warning: drivers/media/dvb/dvb-core: No such file or directory [enabled by default]

Signed-off-by Andy Shevchenko <[email protected]>

---
 drivers/media/video/saa7134/Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

drivers/media/video/saa7134/Makefile +4 -4

index a646ccf..da38993 100644
@@ -10,7 +10,7 @@ obj-$(CONFIG_VIDEO_SAA7134_ALSA) += saa7134-alsa.o
 
 obj-$(CONFIG_VIDEO_SAA7134_DVB) += saa7134-dvb.o
 
-ccflags-y += -Idrivers/media/video
-ccflags-y += -Idrivers/media/common/tuners
-ccflags-y += -Idrivers/media/dvb/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -I$(srctree)/drivers/media/video
+ccflags-y += -I$(srctree)/drivers/media/common/tuners
+ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb/frontends

Signature · 1 line

1.7.9

Laurent Pinchart

Acked-by on v2 1/7

2012-02-17 18:21 UTC #10 lore raw

In reply to Andy Shevchenko

Hi Andy,

Thanks for the patches.

Quoted 11 lines · On Friday 17 February 2012 10:57:07 Andy Shevchenko wrote:

Without this we have got the warnings like following if build with "make W=1 O=/var/tmp":
CHECK drivers/media/video/videobuf-vmalloc.c
CC [M] drivers/media/video/videobuf-vmalloc.o
+cc1: warning: drivers/media/dvb/dvb-core: No such file or directory
[enabled by default] +cc1: warning: drivers/media/dvb/frontends: No such file or directory [enabled by default] +cc1: warning:
drivers/media/dvb/dvb-core: No such file or directory [enabled by default] +cc1: warning: drivers/media/dvb/frontends: No such file or directory
[enabled by default] LD drivers/media/built-in.o

Quoted 5 lines

Some details could be found in [1] as well.
[1] http://comments.gmane.org/gmane.linux.kbuild.devel/7733
Signed-off-by Andy Shevchenko <[email protected]>

For the whole series,

Acked-by Laurent Pinchart <[email protected]>

Quoted 18 lines

---
 drivers/media/video/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

drivers/media/video/Makefile +3 -3

index 3541388..3bf0aa8 100644
@@ -199,6 +199,6 @@ obj-y	+= davinci/
 
 obj-$(CONFIG_ARCH_OMAP)	+= omap/
 
-ccflags-y += -Idrivers/media/dvb/dvb-core
-ccflags-y += -Idrivers/media/dvb/frontends
-ccflags-y += -Idrivers/media/common/tuners
+ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core
+ccflags-y += -I$(srctree)/drivers/media/dvb/frontends
+ccflags-y += -I$(srctree)/drivers/media/common/tuners

Signature · 3 lines

Regards,

Laurent Pinchart