diff options
author | Mike Isely <isely@pobox.com> | 2006-04-25 19:26:46 -0500 |
---|---|---|
committer | Mike Isely <isely@pobox.com> | 2006-04-25 19:26:46 -0500 |
commit | e362706b3e90987c5ca839def8372bff58fea7c0 (patch) | |
tree | 2c94262c383b9f881b278b9bfe0499231a7458ef /v4l/Makefile | |
parent | 60f073ffa46dc14bcbc82b9c14ff5fb6cc2a5102 (diff) | |
parent | 682261e2c90d58868dd27ef1c524e327074a637d (diff) | |
download | mediapointer-dvb-s2-e362706b3e90987c5ca839def8372bff58fea7c0.tar.gz mediapointer-dvb-s2-e362706b3e90987c5ca839def8372bff58fea7c0.tar.bz2 |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'v4l/Makefile')
-rw-r--r-- | v4l/Makefile | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index e932eeb65..9acafb007 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -217,17 +217,27 @@ reload:: ################################################# # Configuration rules +# SHELL used by kbuild +CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ + else if [ -x /bin/bash ]; then echo /bin/bash; \ + else echo sh; fi ; fi) + +build := srctree=$(KDIR) HOSTCXX=$(CXX) HOSTCC=$(CC) CONFIG_SHELL=$(CONFIG_SHELL) -f $(KDIR)/scripts/Makefile.build obj + xconfig:: links .version + $(MAKE) -C $(KDIR) $(build)=scripts/kconfig qconf-target=1 scripts/kconfig/qconf ./scripts/make_kconfig.pl $(KDIR)/scripts/kconfig/qconf Kconfig ./scripts/make_noconfig.pl gconfig:: links .version + $(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/gconf ./scripts/make_kconfig.pl $(KDIR)/scripts/kconfig/gconf Kconfig ./scripts/make_noconfig.pl config:: links .version + $(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/conf ./scripts/make_kconfig.pl $(KDIR)/scripts/kconfig/conf Kconfig ./scripts/make_noconfig.pl @@ -236,21 +246,24 @@ menuconfig:: links .version ./scripts/make_kconfig.pl -rm scripts/lxdialog scripts/kconfig -if [ -d $(KDIR)/scripts/lxdialog ]; then \ + $(MAKE) -C $(KDIR) $(build)=scripts/lxdialog; \ ln -s $(KDIR)/scripts/lxdialog scripts/lxdialog; \ fi -if [ -d $(KDIR)/scripts/kconfig ]; then \ + if [ -d $(KDIR)/scripts/kconfig/lxdialog ]; then \ + $(MAKE) -C $(KDIR) $(build)=scripts/kconfig/lxdialog; \ + else \ + $(MAKE) -C $(KDIR) $(build)=scripts/kconfig scripts/kconfig/mconf; \ + fi; \ ln -s $(KDIR)/scripts/kconfig scripts/kconfig; \ fi $(KDIR)/scripts/kconfig/mconf Kconfig ./scripts/make_noconfig.pl -allmodconfig:: links .version - ./scripts/make_kconfig.pl - $(KDIR)/scripts/kconfig/conf -m Kconfig - cat .config|grep -v CONFIG_DVB_AV7110_FIRMWARE >.config.new - mv .config.new .config +allyesconfig allmodconfig:: links .version + ./scripts/make_kconfig.pl 1 ./scripts/make_noconfig.pl ################################################# |