diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 8 | ||||
| -rwxr-xr-x | v4l/scripts/make_kconfig.pl | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 963146eaa..f9af44703 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -30,7 +30,7 @@ endif ################################################# # default compilation rule -default:: config-compat.h Makefile.media links .version +default:: config-compat.h Makefile.media links .version oss @if [ "x$(SRCDIR)" != x ]; then echo SRCDIR is $(SRCDIR) ; fi $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules ./scripts/rmmod.pl check @@ -229,6 +229,10 @@ links:: @find ../linux/drivers/media -name '*.[ch]' -type f -exec ln -sf '{}' . \; @find ../linux/sound -name '*.[ch]' -type f -exec ln -sf '{}' . \; +# This link is so code with #include "oss/*.h" will find its header files +oss: + ln -sf . oss + config-compat.h:: .myconfig @perl \ -e 'print "#ifndef __CONFIG_COMPAT_H__\n";' \ @@ -267,7 +271,7 @@ distclean:: clean Kconfig Kconfig.kern .config .config.cmd .myconfig \ .kconfig.dep -rm -rf .tmp_versions - -rm -f scripts/lxdialog scripts/kconfig + -rm -f scripts/lxdialog scripts/kconfig oss @find .. -name '*.orig' -exec rm '{}' \; @find .. -name '*.rej' -exec rm '{}' \; diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl index 6f1b108c1..c1a60e5a9 100755 --- a/v4l/scripts/make_kconfig.pl +++ b/v4l/scripts/make_kconfig.pl @@ -211,7 +211,7 @@ sub checkdeps() # Convert a Kconfig expression to a Perl expression sub toperl($) { - $_ = shift; + local $_ = shift; # Turn n,m,y into 0,1,2 s/\bn\b/0/g; s/\bm\b/1/g; s/\by\b/2/g; @@ -430,7 +430,6 @@ open OUT, ">Kconfig" or die "Cannot write Kconfig file"; print OUT <<"EOF"; mainmenu "V4L/DVB menu" source Kconfig.kern -source Kconfig.sound config VIDEO_KERNEL_VERSION bool "Enable drivers not supported by this kernel" default n |