diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-07 19:32:03 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-07 19:32:03 -0300 |
| commit | ffd2e96a4ec0c5aec4c3629ce58c8f0cee88deb0 (patch) | |
| tree | 24d60bc28a87a23a79309ec6a194b530ac35f43b /v4l | |
| parent | 9a5a7b6c35191d8c0681eba05fa6b2d0e63c4583 (diff) | |
| parent | 27e0a2e8659f2e3e37b7781c322647040d3566c3 (diff) | |
| download | mediapointer-dvb-s2-ffd2e96a4ec0c5aec4c3629ce58c8f0cee88deb0.tar.gz mediapointer-dvb-s2-ffd2e96a4ec0c5aec4c3629ce58c8f0cee88deb0.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 20 | ||||
| -rw-r--r-- | v4l/compat.h | 1 | ||||
| -rwxr-xr-x | v4l/scripts/makelinks.sh | 2 |
3 files changed, 21 insertions, 2 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 58b160397..3ba4603f3 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -25,7 +25,7 @@ endif ################################################# # default compilation rule -default:: Makefile.media links .version +default:: config-compat.h Makefile.media links .version echo srcdir $(SRCDIR) $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules @@ -188,6 +188,22 @@ links:: @find ../linux/drivers/media -name '*.[ch]' -type f -exec ln -sf '{}' . \; @find ../linux/sound -name '*.[ch]' -type f -exec ln -sf '{}' . \; +config-compat.h:: .myconfig + @echo \#ifndef __CONFIG_COMPAT_H__ > config-compat.h + @echo \#define __CONFIG_COMPAT_H__ >> config-compat.h + @echo >> config-compat.h + @echo \#include \<linux\/config\.h\> >> config-compat.h + @echo >> config-compat.h + @grep "CONFIG\_" .myconfig | grep -v "\:\= n" | \ + sed s/"CONFIG\_"/"\#undef CONFIG\_"/1 | \ + sed s/"\:\= ."/""/1 >> config-compat.h >> config-compat.h + @echo >> config-compat.h + @grep "CONFIG\_" .myconfig | grep -v "\:\= n" | \ + sed s/"CONFIG\_"/"\#define CONFIG\_"/1 | \ + sed s/"\:\="/""/1 >> config-compat.h >> config-compat.h + @echo >> config-compat.h + @echo \#endif >> config-compat.h + kernel-links makelinks:: cd ..; v4l/scripts/makelinks.sh $(KDIR) @@ -204,7 +220,7 @@ clean:: @find . -name '*.c' -type l -exec rm '{}' \; @find . -name '*.h' -type l -exec rm '{}' \; -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump \ - ivtv-svnversion.h + ivtv-svnversion.h config-compat.h distclean:: clean -rm -f .version .*.o.flags .*.o.d Makefile.media \ diff --git a/v4l/compat.h b/v4l/compat.h index 0bcb238fb..b9138c7be 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -10,6 +10,7 @@ #include <linux/version.h> #include <linux/utsname.h> #include <linux/sched.h> +#include "config-compat.h" #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18) # define minor(x) MINOR(x) diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh index a66989771..03fd48849 100755 --- a/v4l/scripts/makelinks.sh +++ b/v4l/scripts/makelinks.sh @@ -39,10 +39,12 @@ done for x in `find include -type d | grep -v CVS` ; do ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h + touch $1/$x/config-compat.h done for x in `find drivers/media -type d | grep -v CVS` ; do ln -f -s $PWD/../v4l/compat.h $1/$x/compat.h + touch $1/$x/config-compat.h done cd .. |