From 70d1bdb4e801ae6b0c29d2f103225c966b9eded4 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 26 Feb 2006 01:16:54 -0400
Subject: add pvrusb2 to local v4l-dvb build

From: Michael Krufky <mkrufky@linuxtv.org>

- removed 'make pvrusb2' merge command
- created in-kernel Makefile, Kconfig not yet done.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 linux/drivers/media/video/pvrusb2/Makefile | 11 +++++++++++
 v4l/Make.config                            |  3 +--
 v4l/Makefile                               |  7 +------
 3 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 linux/drivers/media/video/pvrusb2/Makefile

diff --git a/linux/drivers/media/video/pvrusb2/Makefile b/linux/drivers/media/video/pvrusb2/Makefile
new file mode 100644
index 000000000..c83742fb1
--- /dev/null
+++ b/linux/drivers/media/video/pvrusb2/Makefile
@@ -0,0 +1,11 @@
+pvrusb2-objs	:= pvrusb2-i2c-core.o pvrusb2-i2c-cmd-v4l2.o \
+		   pvrusb2-audio.o pvrusb2-i2c-chips-v4l2.o \
+		   pvrusb2-encoder.o pvrusb2-video-v4l.o \
+		   pvrusb2-eeprom.o pvrusb2-tuner.o pvrusb2-demod.o \
+		   pvrusb2-main.o pvrusb2-hdw.o pvrusb2-v4l2.o \
+		   pvrusb2-sysfs.o pvrusb2-context.o pvrusb2-io.o \
+		   pvrusb2-ioread.o pvrusb2-debugifc.o
+
+obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o
+
+EXTRA_CFLAGS += -I$(src)/..
diff --git a/v4l/Make.config b/v4l/Make.config
index 0dd4365ce..802c847a2 100644
--- a/v4l/Make.config
+++ b/v4l/Make.config
@@ -20,7 +20,7 @@ CONFIG_VIDEO_ALSA	:= y
 
 CONFIG_VIDEO_ADV_DEBUG	:= y
 
-CONFIG_VIDEO_PVRUSB2	:= n
+CONFIG_VIDEO_PVRUSB2	:= m
 
 CONFIG_VIDEO_IVTV	:= n
 
@@ -112,4 +112,3 @@ ifeq ($(CONFIG_DVB_CORE),m)
 endif
 
 CONFIG_VIDEO_IVTV := $(if $(wildcard $(src)/ivtv-svnversion.h),m)
-CONFIG_VIDEO_PVRUSB2 := $(if $(wildcard $(src)/.pvrusb2-merge),m)
diff --git a/v4l/Makefile b/v4l/Makefile
index 1a34c6f24..d90e4b8ae 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -345,11 +345,6 @@ all:: default
 default:: links .version
 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules
 
-pvrusb2::
-	@echo creating pvrusb2 symbolic links...
-	@find ../v4l_experimental/pvrusb2 -name '*.[ch]' -type f -exec ln -sf '{}' . \;
-	@echo 'm' > .pvrusb2-merge
-
 ivtv-checkout::
 	@if [ ! -d ivtv ]; then \
 		echo retrieving the latest ivtv sources from ivtvdriver.org; \
@@ -523,7 +518,7 @@ rmmodules::
 clean::
 	@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 ivtv-svnversion.h .pvrusb2-merge
+	-rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump ivtv-svnversion.h
 
 distclean:: clean
 	-rm -f .version .*.o.flags .*.o.d
-- 
cgit v1.2.3