diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-04-12 01:06:33 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-04-12 01:06:33 -0400 |
| commit | 910221dc42da61230663602c4dc35b38e3f15270 (patch) | |
| tree | 7a85a8c5fa91d4b79fd52b298a64b66ddd44c0aa | |
| parent | 88c7f60f87ea3b6e95e78159d8488256b8379420 (diff) | |
| download | mediapointer-dvb-s2-910221dc42da61230663602c4dc35b38e3f15270.tar.gz mediapointer-dvb-s2-910221dc42da61230663602c4dc35b38e3f15270.tar.bz2 | |
fix ivtv virtual merge build and install
From: Michael Krufky <mkrufky@linuxtv.org>
The merged ivtv build functionality was lost in the new build configuration.
This patch restores the build and install functionality for both ivtv and
cx88-ivtv.
make ivtv enable merged ivtv build
make cx88-ivtv enable cx88-ivtv emulation mode for cx88-blackbird
make ivtv-up update ivtv sources using subversion
make ivtv-install install modules
make ivtv-rminstall remove modules
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
| -rw-r--r-- | v4l/Makefile | 1 | ||||
| -rw-r--r-- | v4l/Makefile.ivtv | 26 |
2 files changed, 27 insertions, 0 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index ad1f1ac23..e932eeb65 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -13,6 +13,7 @@ default:: Makefile.media links .version -include $(obj)/.myconfig -include $(obj)/Makefile.media +-include $(obj)/Makefile.ivtv ################################################# # CFLAGS configuration diff --git a/v4l/Makefile.ivtv b/v4l/Makefile.ivtv new file mode 100644 index 000000000..12f395e39 --- /dev/null +++ b/v4l/Makefile.ivtv @@ -0,0 +1,26 @@ +# +# ivtv build rules +# +CONFIG_VIDEO_IVTV := $(if $(wildcard $(src)/ivtv-svnversion.h),m) +CONFIG_VIDEO_CX88_IVTV := $(if $(wildcard $(src)/cx88-ivtv.c),m) + +ivtv-objs := ivtv-driver.o ivtv-fileops.o ivtv-i2c.o \ + ivtv-streams.o ivtv-firmware.o ivtv-reset.o \ + ivtv-gpio.o ivtv-queue.o ivtv-irq.o ivtv-mailbox.o \ + ivtv-vbi.o ivtv-kthreads.o ivtv-audio.o ivtv-ioctl.o \ + ivtv-controls.o ivtv-video.o ivtv-cards.o ivtv-yuv.o +ivtv-fb-objs := ivtv-osd.o ivtv-queue.o + +obj-$(CONFIG_VIDEO_IVTV) += ivtv.o ivtv-fb.o +obj-$(CONFIG_VIDEO_CX88_IVTV) += cx88-ivtv.o + +ivtv-install:: + @echo -e "\nInstalling $(KDIR26)/video/ivtv files:" + @install -d $(KDIR26)/video/ivtv + @files='ivtv.ko ivtv-fb.ko cx88-ivtv.ko '; for i in $$files;do if [ -e $$i ]; then echo -n "$$i "; install -m 644 -c $$i $(KDIR26)/video/ivtv; fi; done; echo; + /sbin/depmod -a ${KERNELRELEASE} + +ivtv-rminstall:: + @echo -e "\nRemoving old $(DEST) files\n" + @echo -e "\nRemoving old $(KDIR26)/video/ivtv files:" + @files='ivtv.ko ivtv-fb.ko cx88-ivtv.ko '; for i in $$files;do if [ -e $(KDIR26)/video/ivtv/$$i ]; then echo -n "$$i "; rm $(KDIR26)/video/ivtv/$$i; fi; done; for i in $$files;do if [ -e $(KDIR26)/video/ivtv/$$i.gz ]; then echo -n "$$i.gz "; rm $(KDIR26)/video/ivtv/$$i.gz; fi; done; echo; |