diff options
| -rw-r--r-- | v4l/ChangeLog | 8 | ||||
| -rw-r--r-- | v4l/scripts/merge-trees.sh | 9 | ||||
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 9 |
3 files changed, 26 insertions, 0 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 2ec96a743..42a3365c0 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-10-08 03:24 mkrufky + + * ../v4l/scripts/merge-trees.sh: + * ../v4l/scripts/unmerge-trees.sh: + - now make clean calls make unmerge-trees in merged build environment. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-08 03:04 mkrufky * ../linux/drivers/media/video/bttv.h: diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index 8fa378a0d..2244ccfeb 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -79,3 +79,12 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile @echo -e "\nEliminating old V4L modules (errors on this step is not a problem).." -@rm -r $(DEST) \ +@@ -254,7 +255,7 @@ rminstall:: + rmmodules:: + rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) + +-clean:: ++clean:: unmerge-trees + find . -name '*.c' -type l -exec rm '{}' \; + find . -name '*.h' -type l -exec rm '{}' \; + -rm -f *~ *.o *.ko *.mod.c diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index c8bad7abe..b06a66938 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -79,3 +79,12 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile @echo -e "\nEliminating old V4L modules (errors on this step is not a problem).." -@rm -r $(DEST) \ +@@ -255,7 +254,7 @@ rminstall:: dvb-rminstall + rmmodules:: + rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) + +-clean:: unmerge-trees ++clean:: + find . -name '*.c' -type l -exec rm '{}' \; + find . -name '*.h' -type l -exec rm '{}' \; + -rm -f *~ *.o *.ko *.mod.c |