diff options
| author | Michael Krufky <devnull@localhost> | 2005-08-28 20:01:58 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-08-28 20:01:58 +0000 |
| commit | 215cb7fd34aede78b8777fc3b2c845e582330768 (patch) | |
| tree | 8cd2830c03d27e3643e04a6c46760366c6853ae4 /v4l/scripts/unmerge-trees.sh | |
| parent | 8e38f13981e44f9ea30358a6ad14a9348651c398 (diff) | |
| download | mediapointer-dvb-s2-215cb7fd34aede78b8777fc3b2c845e582330768.tar.gz mediapointer-dvb-s2-215cb7fd34aede78b8777fc3b2c845e582330768.tar.bz2 | |
fixed make install in tree-merge
Diffstat (limited to 'v4l/scripts/unmerge-trees.sh')
| -rw-r--r-- | v4l/scripts/unmerge-trees.sh | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index 4b76857c1..e0e32274c 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -52,9 +52,9 @@ diff -upr video4linux/Make.config video4linux.orig/Make.config - CONFIG_DVB_BT8XX := m endif -diff -upr video4linux/Makefile video4linux.orig/Makefile ---- video4linux/Makefile 2005-08-28 12:29:03.000000000 +0000 -+++ video4linux.orig/Makefile 2005-08-28 12:00:10.000000000 +0000 +diff -up video4linux/Makefile video4linux.orig/Makefile +--- video4linux/Makefile 2005-08-28 15:52:54.000000000 +0000 ++++ video4linux.orig/Makefile 2005-08-28 15:42:01.000000000 +0000 @@ -45,10 +45,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 @@ -76,24 +76,43 @@ diff -upr 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) -@@ -141,7 +138,6 @@ inst_video += ir-kbd-gpio.ko ir-kbd-i2c. +@@ -141,9 +138,6 @@ inst_video += ir-kbd-gpio.ko ir-kbd-i2c. inst_cx88 := cx8800.ko cx8802.ko cx88-alsa.ko inst_cx88 += cx88-blackbird.ko cx88xx.ko cx88-dvb.ko inst_saa7134 := saa6752hs.ko saa7134.ko saa7134-empress.ko saa7134-dvb.ko --inst_frontends := cx22702.ko dvb-pll.ko mt352.ko lgdt330x.ko or51132.ko tda1004x.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 v4l_modules := $(shell lsmod|cut -d' ' -f1 ) $(patsubst %.ko,%,$(inst-m)) -@@ -161,9 +157,6 @@ install:: rminstall +@@ -163,12 +157,6 @@ install:: rminstall -install -d $(KDIR26)/common -install -m 644 -c $(inst_common) $(KDIR26)/common - -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 +@@ -196,13 +184,11 @@ 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 $(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 -upr video4linux/cx88-dvb.c video4linux.orig/cx88-dvb.c --- video4linux/cx88-dvb.c 2005-08-17 00:49:02.000000000 +0000 +++ video4linux.orig/cx88-dvb.c 2005-08-17 00:48:25.000000000 +0000 |