diff options
| -rw-r--r-- | v4l/ChangeLog | 9 | ||||
| -rw-r--r-- | v4l/Makefile | 3 | ||||
| -rw-r--r-- | v4l/scripts/merge-pvrusb2.sh | 17 |
3 files changed, 23 insertions, 6 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index c9dd63930..e774822d1 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2006-01-21 16:51 mkrufky + + * v4l/Makefile: + * v4l/scripts/merge-pvrusb2.sh: + - 'make pvrusb2-unmerge' will un-patch the build files + without the need to do 'make clean' + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2006-01-21 16:21 mkrufky * linux/drivers/media/dvb/b2c2/flexcop-fe-tuner.c: diff --git a/v4l/Makefile b/v4l/Makefile index 3c8a517a0..4c1bbe96c 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -321,6 +321,9 @@ default:: links .version pvrusb2:: @scripts/merge-pvrusb2.sh +pvrusb2-unmerge:: +# patch -R -p1 < scripts/merge-pvrusb2.sh + links:: @echo creating symbolic links... @find ../linux/drivers/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \; diff --git a/v4l/scripts/merge-pvrusb2.sh b/v4l/scripts/merge-pvrusb2.sh index a428a9d8f..e12d79a3f 100644 --- a/v4l/scripts/merge-pvrusb2.sh +++ b/v4l/scripts/merge-pvrusb2.sh @@ -27,20 +27,25 @@ patch -p1 <<'DIFF' --- v4l.orig/Makefile +++ v4l/Makefile -@@ -318,7 +318,7 @@ +@@ -319,10 +319,10 @@ $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules pvrusb2:: - @scripts/merge-pvrusb2.sh +# @scripts/merge-pvrusb2.sh + pvrusb2-unmerge:: +-# patch -R -p1 < scripts/merge-pvrusb2.sh ++ patch -R -p1 < scripts/merge-pvrusb2.sh + links:: @echo creating symbolic links... -@@ -464,6 +464,7 @@ +@@ -464,7 +467,7 @@ dvb-rminstall:: + rmmodules:: + rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) + +-clean:: ++clean:: pvrusb2-unmerge @find . -name '*.c' -type l -exec rm '{}' \; @find . -name '*.h' -type l -exec rm '{}' \; -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump -+ patch -R -p1 < scripts/merge-pvrusb2.sh - - distclean:: clean - -rm -f .version .*.o.flags .*.o.d |