diff options
| -rw-r--r-- | v4l/ChangeLog | 6 | ||||
| -rw-r--r-- | v4l/Makefile | 69 | ||||
| -rw-r--r-- | v4l/scripts/buildpatch | 10 |
3 files changed, 46 insertions, 39 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 594906b39..27b1d7a47 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,9 @@ +2005-06-22 22:27 mchehab + * Makefile: + - Less verbose + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-06-22 15:50 mchehab * .bp/2.6/v4l-driver-doc, doc/API.html: - API.html added, pointing to V4L api at linuxtv. diff --git a/v4l/Makefile b/v4l/Makefile index f77822ecf..8ee72293f 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -134,64 +134,55 @@ default:: linux media $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules -install:: - strip --strip-debug $(inst-m) +install:: rminstall + @echo -e "\nInstalling new V4L modules at corresponding Kernel dir..." + @strip --strip-debug $(inst-m) + -install -d $(KDIR26)/common - -rm $(addprefix $(KDIR26)/common/, $(addsuffix .gz,$(inst_common))) 2>/dev/null -install -m 644 -c $(inst_common) $(KDIR26)/common -install -d $(KDIR26)/dvb/frontends - -rm $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null -install -m 644 -c $(inst_frontends) $(KDIR26)/dvb/frontends -install -d $(KDIR26)/video - -rm $(addprefix $(KDIR26)/video/, $(addsuffix .gz,$(inst_video))) 2>/dev/null -install -m 644 -c $(inst_video) $(KDIR26)/video -install -d $(KDIR26)/video/cx88 - -rm $(addprefix $(KDIR26)/video/cx88/, $(addsuffix .gz,$(inst_cx88))) 2>/dev/null -install -m 644 -c $(inst_cx88) $(KDIR26)/video/cx88 -install -d $(KDIR26)/video/saa7134 - -rm $(addprefix $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null -install -m 644 -c $(inst_saa7134) $(KDIR26)/video/saa7134 - -rm -r $(DEST) - /sbin/depmod -a -v4l_install:: - strip --strip-debug $(inst-m) - - -rm $(addprefix $(KDIR26)/common/, $(inst_common)) 2>/dev/null - -rm $(addprefix $(KDIR26)/common/, $(addsuffix .gz,$(inst_common))) 2>/dev/null - -rm $(addprefix $(KDIR26)/dvb/frontends/, $(inst_frontends)) 2>/dev/null - -rm $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null - -rm $(addprefix $(KDIR26)/video/, $(inst_video)) 2>/dev/null - -rm $(addprefix $(KDIR26)/video/, $(addsuffix .gz,$(inst_video))) 2>/dev/null - -rm $(addprefix $(KDIR26)/video/cx88/, $(inst_cx88)) 2>/dev/null - -rm $(addprefix $(KDIR26)/video/cx88/, $(addsuffix .gz,$(inst_cx88))) 2>/dev/null - -rm $(addprefix $(KDIR26)/video/saa7134/, $(inst_saa7134)) 2>/dev/null - -rm $(addprefix $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null - -mkdir -p $(DEST) - -cp -v $(inst-m) $(DEST) + +v4l_install:: rminstall + @echo -e "\nInstalling new V4L modules at $(DEST)..." + + @strip --strip-debug $(inst-m) + + -install -d $(DEST) + install -m 644 -c $(inst-m) $(DEST) + /sbin/depmod -a -rminstall: - -rm -r $(DEST) - - -rm $(addprefix $(KDIR26)/common/, $(inst_common)) 2>/dev/null - -rm $(addprefix $(KDIR26)/common/, $(addsuffix .gz,$(inst_common))) 2>/dev/null - -rm $(addprefix $(KDIR26)/dvb/frontends/, $(inst_frontends)) 2>/dev/null - -rm $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null - -rm $(addprefix $(KDIR26)/video/, $(inst_video)) 2>/dev/null - -rm $(addprefix $(KDIR26)/video/, $(addsuffix .gz,$(inst_video))) 2>/dev/null - -rm $(addprefix $(KDIR26)/video/cx88/, $(inst_cx88)) 2>/dev/null - -rm $(addprefix $(KDIR26)/video/cx88/, $(addsuffix .gz,$(inst_cx88))) 2>/dev/null - -rm $(addprefix $(KDIR26)/video/saa7134/, $(inst_saa7134)) 2>/dev/null - -rm $(addprefix $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null - -rmmodules: +rminstall:: + @echo -e "\nEliminating old V4L modules (errors on this step is not a problem).." + + -@rm -r $(DEST) \ + $(addprefix $(KDIR26)/common/, $(inst_common)) \ + $(addprefix $(KDIR26)/dvb/frontends/, $(inst_frontends)) \ + $(addprefix $(KDIR26)/video/, $(inst_video)) \ + $(addprefix $(KDIR26)/video/cx88/, $(inst_cx88)) \ + $(addprefix $(KDIR26)/video/saa7134/, $(inst_saa7134)) \ + $(addprefix $(KDIR26)/common/, $(addsuffix .gz,$(inst_common))) \ + $(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) \ + $(addprefix $(KDIR26)/video/, $(addsuffix .gz,$(inst_video))) \ + $(addprefix $(KDIR26)/video/cx88/, $(addsuffix .gz,$(inst_cx88))) \ + $(addprefix $(KDIR26)/video/saa7134/, $(addsuffix .gz,$(inst_saa7134))) 2>/dev/null + @echo + +rmmodules:: rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) clean:: diff --git a/v4l/scripts/buildpatch b/v4l/scripts/buildpatch index e308d7ec2..7658390e9 100644 --- a/v4l/scripts/buildpatch +++ b/v4l/scripts/buildpatch @@ -131,6 +131,16 @@ sub makediff ($$) { close DIFF; unlink $tmp; + +# my $pid = open (DIFFSTAT, '-|'); +# if (!defined $pid) { +# die "$0: can't fork diffstat: $!\n"; +# } elsif ($pid == 0) { +# open (STDERR, '>&STDOUT') or die "$0: can't reopen stderr: $!\n"; +# exec (split(/\s+/, "diffstat -p0 -w72 -"), $diff) +# or die "$0: can't fork diffstat: $!\n"; +# } + } sub delfile ($) { |