diff options
| -rw-r--r-- | v4l/ChangeLog | 11 | ||||
| -rw-r--r-- | v4l/Make.config | 5 | ||||
| -rw-r--r-- | v4l/Makefile | 6 |
3 files changed, 20 insertions, 2 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 1b26118f1..295d65a9e 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,14 @@ +2005-10-09 20:12 mchehab + + * ../v4l/Make.config: + + - Fixed dvb compiling. + + * ../v4l/Makefile: + - Included some options to make easier to commit. + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-10-09 19:37 mchehab * ../v4l/Makefile: diff --git a/v4l/Make.config b/v4l/Make.config index bd8f1c145..3b3e69803 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -25,8 +25,9 @@ CONFIG_DVB_BT8XX := n CONFIG_DVB_FRONTENDS := n ifneq ($(KERNELRELEASE),) -need_dvb = $(shell test $(SUBLEVEL) -ge 12 && echo yes) -need_dvb = $(shell test $(VERSION) -lt 6 && echo no) +need_dvb := $(shell test $(SUBLEVEL) -ge 12 -a $(PATCHLEVEL) -ge 6 && echo yes) +#need_dvb := $(shell test $(PATCHLEVEL) -ge 6 && echo yes) +#need_dvb := $(shell test $(SUBLEVEL) -lt 12 && echo no) endif ifeq ($(need_dvb),yes) diff --git a/v4l/Makefile b/v4l/Makefile index 7f09ea0f0..60b62a048 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -263,6 +263,12 @@ distclean:: clean -rm -f .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd -rm -rf .tmp_versions +changelog:: + make -C .. changelog + +commit:: + cd ..; cvs commit + .version: ifneq ($(KERNELRELEASE),) echo -e VERSION=$(VERSION)\\nPATCHLEVEL:=$(PATCHLEVEL)\\nSUBLEVEL:=$(SUBLEVEL)\\nKERNELRELEASE:=$(KERNELRELEASE) > $(obj)/.version |