From b7434f34ac55e387cc42b901baaad41e19151814 Mon Sep 17 00:00:00 2001 From: Manu Abraham Date: Fri, 17 Mar 2006 21:01:39 +0400 Subject: fix Makefile and Kconfig From: Michael Krufky Signed-off-by: Michael Krufky Signed-off-by: Manu Abraham --- v4l/scripts/cardlist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/cardlist b/v4l/scripts/cardlist index e368e6b4f..901d3fb18 100755 --- a/v4l/scripts/cardlist +++ b/v4l/scripts/cardlist @@ -1,6 +1,6 @@ #!/bin/sh -scripts/bttv.pl ../linux/drivers/media/video/bttv.h ../linux/drivers/media/video/bttv-cards.c \ +scripts/bttv.pl ../linux/drivers/media/video/bt8xx/bttv.h ../linux/drivers/media/video/bt8xx/bttv-cards.c \ | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.bttv scripts/cx88.pl ../linux/drivers/media/video/cx88/cx88.h ../linux/drivers/media/video/cx88/cx88-cards.c \ -- cgit v1.2.3 From 03fd6c50d68ef10f899577a933b760e10d90bac1 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sat, 18 Mar 2006 11:24:50 -0500 Subject: fix 'make kernel-links' for new and/or relocated source code From: Michael Krufky use 'find' to symlink compat.h into each directory in drivers/ and include/ instead of explicitly specifying each that needs compat.h This will remove the need to update v4l/scripts/makelinks.sh each time a new driver is introduced to the tree, and fixes it's current broken state. Signed-off-by: Michael Krufky --- v4l/scripts/makelinks.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh index 44fa17759..981df1af8 100755 --- a/v4l/scripts/makelinks.sh +++ b/v4l/scripts/makelinks.sh @@ -37,15 +37,15 @@ for x in `find include -type f | grep -v CVS | grep -v .cvsignore` ; do ln -v -f -s $PWD/$x $1/$x done -cd .. +for x in `find include -type d | grep -v CVS` ; do + ln -v -f -s $PWD/../v4l/compat.h $1/$x/compat.h +done -ln -v -f -s $PWD/v4l/compat.h $1/include/media/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/include/linux/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/common/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/bt8xx/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/cinergyT2/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/dvb/dvb-core/compat.h -ln -v -f -s $PWD/v4l/compat.h $1/drivers/media/video/compat.h +for x in `find drivers/media -type d | grep -v CVS` ; do + ln -v -f -s $PWD/../v4l/compat.h $1/$x/compat.h +done + +cd .. patch -p0 <<'DIFF' diff -u -p videodev.h --- linux/include/linux/videodev.h -- cgit v1.2.3 From 883abfc44e00cd092b843f4831a229f54eb20844 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sat, 18 Mar 2006 14:44:06 -0500 Subject: make 'make kernel-links' less verbose From: Michael Krufky Signed-off-by: Michael Krufky --- v4l/scripts/makelinks.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh index 981df1af8..a66989771 100755 --- a/v4l/scripts/makelinks.sh +++ b/v4l/scripts/makelinks.sh @@ -26,23 +26,23 @@ for x in `find include -type d | grep -v CVS` ; do done for x in `find Documentation -type f | grep -v CVS | grep -v .cvsignore` ; do - ln -v -f -s $PWD/$x $1/$x + ln -f -s $PWD/$x $1/$x done for x in `find drivers -type f | grep -v CVS | grep -v .cvsignore` ; do - ln -v -f -s $PWD/$x $1/$x + ln -f -s $PWD/$x $1/$x done for x in `find include -type f | grep -v CVS | grep -v .cvsignore` ; do - ln -v -f -s $PWD/$x $1/$x + ln -f -s $PWD/$x $1/$x done for x in `find include -type d | grep -v CVS` ; do - ln -v -f -s $PWD/../v4l/compat.h $1/$x/compat.h + ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h done for x in `find drivers/media -type d | grep -v CVS` ; do - ln -v -f -s $PWD/../v4l/compat.h $1/$x/compat.h + ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h done cd .. -- cgit v1.2.3