From 9c60e04085bbfe5cf2eb699d0e070efbf1171389 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Wed, 19 Oct 2005 00:45:47 +0000 Subject: - Tree-merge enabled once again. Signed-off-by: Michael Krufky --- v4l/scripts/merge-trees.sh | 13 +++++++++++-- v4l/scripts/unmerge-trees.sh | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/merge-trees.sh b/v4l/scripts/merge-trees.sh index 9ef965988..fcbe09a0e 100644 --- a/v4l/scripts/merge-trees.sh +++ b/v4l/scripts/merge-trees.sh @@ -48,9 +48,18 @@ diff -up v4l-kernel.orig/v4l/Makefile v4l-kernel/v4l/Makefile EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) -@@ -184,7 +185,7 @@ links:: +@@ -171,7 +172,7 @@ export LC_ALL + default:: links .version + $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules - @ln -sf ../linux/drivers/media/common/ir-common.c . +-links:: ++links:: dvb-links + @echo creating symbolic links... + @find ../linux/drivers/media/video -name '*.[c,h]' -type f -exec ln -sf '{}' . \; + @find ../linux/drivers/usb/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \; +@@ -184,7 +185,7 @@ links:: + @find ../linux/drivers/media/dvb/frontends -name '*.[c,h]' -type l -exec ln -sf '{}' . \; + @find ../linux/drivers/media/dvb/bt8xx -name '*.[c,h]' -type l -exec ln -sf '{}' . \; -install:: rminstall +install:: rminstall dvb-install diff --git a/v4l/scripts/unmerge-trees.sh b/v4l/scripts/unmerge-trees.sh index ae5f60648..90b2ee2ca 100644 --- a/v4l/scripts/unmerge-trees.sh +++ b/v4l/scripts/unmerge-trees.sh @@ -29,9 +29,18 @@ diff -up v4l-kernel/v4l/Makefile v4l-kernel.orig/v4l/Makefile EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core/ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) -@@ -185,7 +184,7 @@ links:: +@@ -172,7 +171,7 @@ export LC_ALL + default:: links .version + $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules - @ln -sf ../linux/drivers/media/common/ir-common.c . +-links:: dvb-links ++links:: + @echo creating symbolic links... + @find ../linux/drivers/media/video -name '*.[c,h]' -type f -exec ln -sf '{}' . \; + @find ../linux/drivers/usb/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \; +@@ -185,7 +184,7 @@ links:: + @find ../linux/drivers/media/dvb/frontends -name '*.[c,h]' -type l -exec ln -sf '{}' . \; + @find ../linux/drivers/media/dvb/bt8xx -name '*.[c,h]' -type l -exec ln -sf '{}' . \; -install:: rminstall dvb-install +install:: rminstall -- cgit v1.2.3