diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-29 23:36:14 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-29 23:36:14 +0200 |
| commit | 4478dd69f2b9c27d2e6a4c9d6bbd4528483ec73c (patch) | |
| tree | b869e5cdf9516d737b09791ba1d96a4036316c70 /v4l2-apps/util | |
| parent | 46280e1e8dab9fd0f9d10fbc5f7183c634328bd7 (diff) | |
| download | mediapointer-dvb-s2-4478dd69f2b9c27d2e6a4c9d6bbd4528483ec73c.tar.gz mediapointer-dvb-s2-4478dd69f2b9c27d2e6a4c9d6bbd4528483ec73c.tar.bz2 | |
v4l2-apps: fix v4l2-apps build and 'make firmware' warnings
From: Hans Verkuil <hverkuil@xs4all.nl>
- fix some warnings when creating/removing directories when running
'make firmware'
- fix v4l2-apps build: copy and strip the linux/include headers first
to avoid the kernel-specific constructs in the original headers.
Update the include paths to point to the copy.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'v4l2-apps/util')
| -rw-r--r-- | v4l2-apps/util/Makefile | 10 | ||||
| -rw-r--r-- | v4l2-apps/util/qv4l2/qv4l2.pro | 2 | ||||
| -rw-r--r-- | v4l2-apps/util/rds/Makefile | 2 | ||||
| -rw-r--r-- | v4l2-apps/util/xc3028-firmware/Makefile | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/v4l2-apps/util/Makefile b/v4l2-apps/util/Makefile index 41d4712e1..bfd5a72b8 100644 --- a/v4l2-apps/util/Makefile +++ b/v4l2-apps/util/Makefile @@ -4,7 +4,7 @@ ifeq ($(KERNEL_DIR),) KERNEL_DIR = /usr endif -CPPFLAGS += -I../../linux/include -D_GNU_SOURCE +CPPFLAGS += -I../include -D_GNU_SOURCE LDFLAGS += -lm binaries = v4l2-ctl v4l2-dbg ivtv-ctl cx18-ctl v4l-board-dbg @@ -26,8 +26,8 @@ clean:: rm -rf keycodes parse.h keytable qv4l2: - if [ ! -f qv4l2/Makefile ]; then (cd qv4l2; qmake); fi - make -C qv4l2 + -if [ ! -f qv4l2/Makefile ]; then (cd qv4l2; qmake); fi + $(MAKE) -C qv4l2 v4l2-dbg: v4l2-dbg.o v4l2-driverids.o v4l2-chipids.o $(CXX) $^ -o $@ @@ -59,12 +59,12 @@ keytable: keytable.c parse.h keytables v4l-board-dbg: v4l-board-dbg.c bttv-dbg.h saa7134-dbg.h em28xx-dbg.h -v4l2-driverids.cpp: ../../linux/include/linux/i2c-id.h +v4l2-driverids.cpp: ../include/linux/i2c-id.h @echo "struct driverid { const char *name; unsigned id; } driverids[] = {" >$@ @grep I2C_DRIVERID_ $^ | sed -e 's/.*I2C_DRIVERID_\([0-9A-Z_]*\)[^0-9]*\([0-9]*\).*/{ "\1", \2 },/' | tr A-Z a-z >>$@ @echo "{ 0, 0 }};" >>$@ -v4l2-chipids.cpp: ../../linux/include/media/v4l2-chip-ident.h +v4l2-chipids.cpp: ../include/media/v4l2-chip-ident.h @echo "struct chipid { const char *name; unsigned id; } chipids[] = {" >$@ @grep V4L2_IDENT_ $^ | sed -e 's/.*V4L2_IDENT_\([0-9A-Z_]*\)[^=]*=[^0-9]*\([0-9]*\).*/{ "\1", \2 },/' | tr A-Z a-z >>$@ @echo "{ 0, 0 }};" >>$@ diff --git a/v4l2-apps/util/qv4l2/qv4l2.pro b/v4l2-apps/util/qv4l2/qv4l2.pro index c53a098b5..5e0b7555d 100644 --- a/v4l2-apps/util/qv4l2/qv4l2.pro +++ b/v4l2-apps/util/qv4l2/qv4l2.pro @@ -3,7 +3,7 @@ ###################################################################### TEMPLATE = app -INCLUDEPATH += . ../../../linux/include ../../lib +INCLUDEPATH += . ../../include ../../lib CONFIG += debug # Input diff --git a/v4l2-apps/util/rds/Makefile b/v4l2-apps/util/rds/Makefile index 4f6ebd9f2..fb2213c99 100644 --- a/v4l2-apps/util/rds/Makefile +++ b/v4l2-apps/util/rds/Makefile @@ -1,6 +1,6 @@ # Makefile for linuxtv.org v4l2-apps/util/xc3028-firmware -CPPFLAGS += -I../../../linux/include +CPPFLAGS += -I../../include binaries = rds-saa6588 diff --git a/v4l2-apps/util/xc3028-firmware/Makefile b/v4l2-apps/util/xc3028-firmware/Makefile index 102f712fd..6894e984e 100644 --- a/v4l2-apps/util/xc3028-firmware/Makefile +++ b/v4l2-apps/util/xc3028-firmware/Makefile @@ -1,6 +1,6 @@ # Makefile for linuxtv.org v4l2-apps/util/xc3028-firmware -CPPFLAGS += -I../../../linux/include +CPPFLAGS += -I../../include binaries = firmware-tool |