diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-09-17 14:07:51 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-09-17 14:07:51 -0400 |
| commit | d1301189ccbf756badbde417ca0cc4e4e115f703 (patch) | |
| tree | 6dfc6bd82525784d99c04016977b7008cd2d126f | |
| parent | 4f2b8d095e2ba0c03fe8685bcee8f6eaa905dd9e (diff) | |
| download | mediapointer-dvb-s2-d1301189ccbf756badbde417ca0cc4e4e115f703.tar.gz mediapointer-dvb-s2-d1301189ccbf756badbde417ca0cc4e4e115f703.tar.bz2 | |
use ivtv/driver/Kbuild for build rules in v4l-dvb + ivtv trunk virtual merge
From: Michael Krufky <mkrufky@linuxtv.org>
Use ivtv's Kbuild file to make the build rules for the v4l-dvb + ivtv trunk
virtual merge dynamic. This eliminats the static rules from the v4l-dvb tree
and will prevent future build problems.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
| -rw-r--r-- | v4l/Makefile.ivtv | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/v4l/Makefile.ivtv b/v4l/Makefile.ivtv index 69962f9e4..fa747cd4f 100644 --- a/v4l/Makefile.ivtv +++ b/v4l/Makefile.ivtv @@ -4,14 +4,10 @@ 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 +ifeq ($(CONFIG_VIDEO_IVTV),m) +-include $(obj)/ivtv/driver/Kbuild +endif -obj-$(CONFIG_VIDEO_IVTV) += ivtv.o ivtv-fb.o obj-$(CONFIG_VIDEO_CX88_IVTV) += cx88-ivtv.o ivtv-install:: |