* ../v4l/Make.config:

        * ../v4l/Makefile:
        * ../v4l/scripts/merge-trees.sh:
        * ../v4l/scripts/unmerge-trees.sh:
        - Step one, move merged dvb/v4l cvs tree functionality into Makefile.

        Signed-off-by: Michael Krufky <mkrufky@m1k.net>

2 files changed, 46 insertions, 126 deletions

diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh
index d422b319a..8fa378a0d 100644
--- a/v4l/scripts/merge-trees.sh
+++ b/v4l/scripts/merge-trees.sh
@@ -38,42 +38,22 @@ ln -s ../../dvb-kernel/linux/drivers/media/dvb/dvb-core/dmxdev.h           dmxde
 ln -s ../../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_demux.h        dvb_demux.h
 ln -s ../../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_net.h          dvb_net.h
 ln -s ../../dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_frontend.h     dvb_frontend.h
-patch -p1 <<'DIFF'
-diff -up video4linux.orig/Make.config video4linux/Make.config
---- video4linux.orig/Make.config	2005-10-06 16:03:26.000000000 -0400
-+++ video4linux/Make.config	2005-10-06 19:17:55.000000000 -0400
-@@ -18,6 +18,7 @@ CONFIG_VIDEO_ALSA	:= n
- 
- CONFIG_VIDEO_CX88_DVB	:= n
- CONFIG_VIDEO_SAA7134_DVB := n
-+CONFIG_DVB_BT8XX        := n
- 
- ifneq ($(KERNELRELEASE),)
- need_dvb = $(shell test $(SUBLEVEL) -ge 12 && echo yes)
-@@ -26,5 +27,6 @@ endif
+patch -p2 <<'DIFF'
+diff -up v4l-kernel.orig/v4l/Make.config v4l-kernel/v4l/Make.config
+--- v4l-kernel.orig/v4l/Make.config	2005-10-08 17:31:57.000000000 -0400
++++ v4l-kernel/v4l/Make.config	2005-10-08 17:46:08.000000000 -0400
+@@ -31,5 +31,7 @@ endif
  ifeq ($(need_dvb),yes)
   CONFIG_VIDEO_CX88_DVB	:= m
   CONFIG_VIDEO_SAA7134_DVB := m
 + CONFIG_DVB_BT8XX       := m
++ CONFIG_DVB_FRONTENDS    := m
  endif
  
-diff -up video4linux.orig/Makefile video4linux/Makefile
---- video4linux.orig/Makefile	2005-10-06 16:03:26.000000000 -0400
-+++ video4linux/Makefile	2005-10-06 19:23:41.000000000 -0400
-@@ -50,8 +50,10 @@ obj-$(CONFIG_VIDEO_IR)		+= ir-common.o
- obj-$(CONFIG_VIDEO_TUNER)	+= tuner.o tda9887.o saa6588.o
- obj-$(CONFIG_VIDEO_TVAUDIO)	+= msp3400.o tvaudio.o tvmixer.o
- 
--obj-$(CONFIG_VIDEO_CX88_DVB)	+= video-buf-dvb.o cx88-dvb.o
--obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o
-+obj-$(CONFIG_VIDEO_CX88_DVB)	+= video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt330x.o mt352.o
-+obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o
-+obj-$(CONFIG_DVB_BT8XX)         += bt878.o dvb-bt8xx.o dst.o dst_ca.o
-+obj-$(CONFIG_DVB_BT8XX)         += mt352.o sp887x.o nxt6000.o cx24110.o or51211.o
- 
- # 2.6-only stuff
- ifeq ($(VERSION).$(PATCHLEVEL),2.6)
-@@ -65,6 +67,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile
+--- v4l-kernel.orig/v4l/Makefile	2005-10-08 17:31:57.000000000 -0400
++++ v4l-kernel/v4l/Makefile	2005-10-08 17:45:48.000000000 -0400
+@@ -69,6 +69,7 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  endif
  
  # for DVB
@@ -81,41 +61,21 @@ diff -up video4linux.orig/Makefile video4linux/Makefile
  EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
  EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
  ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
-@@ -148,6 +151,9 @@ inst_cx88 := cx8800.ko cx8802.ko cx88-al
- inst_cx88 += cx88-blackbird.ko cx88xx.ko cx88-dvb.ko
- inst_saa7134 := saa6752hs.ko saa7134.ko saa7134-empress.ko saa7134-dvb.ko
- inst_usb := em2820.ko
-+inst_bt8xx := bt878.ko dvb-bt8xx.ko dst.ko dst_ca.ko
-+inst_frontends := cx22702.ko dvb-pll.ko lgdt330x.ko or51132.ko tda1004x.ko
-+inst_frontends += mt352.ko sp887x.ko nxt6000.ko cx24110.ko or51211.ko
+@@ -173,7 +174,7 @@ links::
+ 
+ 	ln -sf ../linux/drivers/media/common/ir-common.c .
  
- v4l_modules := $(shell lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m))
+-install:: rminstall
++install:: rminstall dvb-install
+ 	@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
  
-@@ -174,6 +180,12 @@ install:: rminstall
- 	-install -d $(KDIR26)/common
- 	-install -m 644 -c $(inst_common) $(KDIR26)/common
+ 	@strip --strip-debug $(inst-m)
+@@ -233,7 +234,7 @@ dvb-rminstall::
+ 		$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null
+ 	@echo
  
-+	-install -d $(KDIR26)/dvb/frontends
-+	-install -m 644 -c $(inst_frontends) $(KDIR26)/dvb/frontends
-+
-+	-install -d $(KDIR26)/dvb/bt8xx
-+	-install -m 644 -c $(inst_bt8xx) $(KDIR26)/dvb/bt8xx
-+
- 	-install -d $(KDIR26)/video
- 	-install -m 644 -c $(inst_video) $(KDIR26)/video
+-rminstall::
++rminstall:: dvb-rminstall
+ 	@echo -e "\nEliminating old V4L modules (errors on this step is not a problem).."
  
-@@ -210,12 +222,14 @@ rminstall::
  	-@rm -r $(DEST) \
- 		$(addprefix $(KDIR26)/common/, $(inst_common)) \
- 		$(addprefix $(KDIR26)/dvb/frontends/, $(inst_frontends)) \
-+		$(addprefix $(KDIR26)/dvb/bt8xx/, $(inst_bt8xx)) \
- 		$(addprefix $(KDIR26)/video/, $(inst_video)) \
- 		$(addprefix $(KDIR26)/video/cx88/, $(inst_cx88)) \
- 		$(addprefix $(KDIR26)/video/saa7134/, $(inst_saa7134)) \
- 		$(addprefix $(KDIRUSB)/, $(inst_usb)) \
- 		$(addprefix $(KDIR26)/common/, $(addsuffix .gz,$(inst_common))) \
- 		$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) \
-+		$(addprefix $(KDIR26)/dvb/bt8xx/, $(addsuffix .gz,$(inst_bt8xx))) \
- 		$(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 \
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh
index 12cb25893..c8bad7abe 100644
--- a/v4l/scripts/unmerge-trees.sh
+++ b/v4l/scripts/unmerge-trees.sh
@@ -38,42 +38,22 @@ rm dmxdev.h 2> /dev/null
 rm dvb_demux.h 2> /dev/null
 rm dvb_net.h 2> /dev/null
 rm dvb_frontend.h 2> /dev/null
-patch -p1 <<'DIFF'
-diff -up video4linux/Make.config video4linux.orig/Make.config
---- video4linux/Make.config	2005-10-06 19:17:55.000000000 -0400
-+++ video4linux.orig/Make.config	2005-10-06 16:03:26.000000000 -0400
-@@ -18,7 +18,6 @@ CONFIG_VIDEO_ALSA	:= n
- 
- CONFIG_VIDEO_CX88_DVB	:= n
- CONFIG_VIDEO_SAA7134_DVB := n
--CONFIG_DVB_BT8XX        := n
- 
- ifneq ($(KERNELRELEASE),)
- need_dvb = $(shell test $(SUBLEVEL) -ge 12 && echo yes)
-@@ -27,6 +26,5 @@ endif
+patch -p2 <<'DIFF'
+diff -up v4l-kernel/v4l/Make.config v4l-kernel.orig/v4l/Make.config
+--- v4l-kernel/v4l/Make.config	2005-10-08 17:46:08.000000000 -0400
++++ v4l-kernel.orig/v4l/Make.config	2005-10-08 17:31:57.000000000 -0400
+@@ -31,7 +31,5 @@ endif
  ifeq ($(need_dvb),yes)
   CONFIG_VIDEO_CX88_DVB	:= m
   CONFIG_VIDEO_SAA7134_DVB := m
 - CONFIG_DVB_BT8XX       := m
+- CONFIG_DVB_FRONTENDS    := m
  endif
  
-diff -up video4linux/Makefile video4linux.orig/Makefile
---- video4linux/Makefile	2005-10-06 19:23:41.000000000 -0400
-+++ video4linux.orig/Makefile	2005-10-06 16:03:26.000000000 -0400
-@@ -50,10 +50,8 @@ obj-$(CONFIG_VIDEO_IR)		+= ir-common.o
- obj-$(CONFIG_VIDEO_TUNER)	+= tuner.o tda9887.o saa6588.o
- obj-$(CONFIG_VIDEO_TVAUDIO)	+= msp3400.o tvaudio.o tvmixer.o
- 
--obj-$(CONFIG_VIDEO_CX88_DVB)	+= video-buf-dvb.o cx88-dvb.o cx22702.o dvb-pll.o or51132.o lgdt330x.o mt352.o
--obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o mt352.o tda1004x.o
--obj-$(CONFIG_DVB_BT8XX)         += bt878.o dvb-bt8xx.o dst.o dst_ca.o
--obj-$(CONFIG_DVB_BT8XX)         += mt352.o sp887x.o nxt6000.o cx24110.o or51211.o
-+obj-$(CONFIG_VIDEO_CX88_DVB)	+= video-buf-dvb.o cx88-dvb.o
-+obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o
- 
- # 2.6-only stuff
- ifeq ($(VERSION).$(PATCHLEVEL),2.6)
-@@ -67,7 +65,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
+diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile
+--- v4l-kernel/v4l/Makefile	2005-10-08 17:45:48.000000000 -0400
++++ v4l-kernel.orig/v4l/Makefile	2005-10-08 17:31:57.000000000 -0400
+@@ -69,7 +69,6 @@ ifeq ($(VERSION).$(PATCHLEVEL),2.6)
  endif
  
  # for DVB
@@ -81,41 +61,21 @@ diff -up video4linux/Makefile video4linux.orig/Makefile
  EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/
  EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/
  ifeq ($(CONFIG_VIDEO_CX88_DVB),m)
-@@ -151,9 +148,6 @@ inst_cx88 := cx8800.ko cx8802.ko cx88-al
- inst_cx88 += cx88-blackbird.ko cx88xx.ko cx88-dvb.ko
- inst_saa7134 := saa6752hs.ko saa7134.ko saa7134-empress.ko saa7134-dvb.ko
- inst_usb := em2820.ko
--inst_bt8xx := bt878.ko dvb-bt8xx.ko dst.ko dst_ca.ko
--inst_frontends := cx22702.ko dvb-pll.ko lgdt330x.ko or51132.ko tda1004x.ko
--inst_frontends += mt352.ko sp887x.ko nxt6000.ko cx24110.ko or51211.ko
+@@ -174,7 +173,7 @@ links::
+ 
+ 	ln -sf ../linux/drivers/media/common/ir-common.c .
  
- v4l_modules := $(shell lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m))
+-install:: rminstall dvb-install
++install:: rminstall
+ 	@echo -e "\nInstalling new V4L modules at corresponding Kernel dir..."
  
-@@ -180,12 +174,6 @@ install:: rminstall
- 	-install -d $(KDIR26)/common
- 	-install -m 644 -c $(inst_common) $(KDIR26)/common
+ 	@strip --strip-debug $(inst-m)
+@@ -234,7 +233,7 @@ dvb-rminstall::
+ 		$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) 2>/dev/null
+ 	@echo
  
--	-install -d $(KDIR26)/dvb/frontends
--	-install -m 644 -c $(inst_frontends) $(KDIR26)/dvb/frontends
--
--	-install -d $(KDIR26)/dvb/bt8xx
--	-install -m 644 -c $(inst_bt8xx) $(KDIR26)/dvb/bt8xx
--
- 	-install -d $(KDIR26)/video
- 	-install -m 644 -c $(inst_video) $(KDIR26)/video
+-rminstall:: dvb-rminstall
++rminstall::
+ 	@echo -e "\nEliminating old V4L modules (errors on this step is not a problem).."
  
-@@ -222,14 +210,12 @@ rminstall::
  	-@rm -r $(DEST) \
- 		$(addprefix $(KDIR26)/common/, $(inst_common)) \
- 		$(addprefix $(KDIR26)/dvb/frontends/, $(inst_frontends)) \
--		$(addprefix $(KDIR26)/dvb/bt8xx/, $(inst_bt8xx)) \
- 		$(addprefix $(KDIR26)/video/, $(inst_video)) \
- 		$(addprefix $(KDIR26)/video/cx88/, $(inst_cx88)) \
- 		$(addprefix $(KDIR26)/video/saa7134/, $(inst_saa7134)) \
- 		$(addprefix $(KDIRUSB)/, $(inst_usb)) \
- 		$(addprefix $(KDIR26)/common/, $(addsuffix .gz,$(inst_common))) \
- 		$(addprefix $(KDIR26)/dvb/frontends/, $(addsuffix .gz,$(inst_frontends))) \
--		$(addprefix $(KDIR26)/dvb/bt8xx/, $(addsuffix .gz,$(inst_bt8xx))) \
- 		$(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 \