diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-13 13:04:56 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-13 13:04:56 -0300 |
| commit | 29dbbb60b1b22bd956e7fc25a2b2d1a9ea577f79 (patch) | |
| tree | 3049a3bbf0ba48fd24b62aaff07ab2925dcb3743 /v4l/Makefile | |
| parent | f9533819a70608d97d03abd7766ffc3f1e3ea655 (diff) | |
| parent | 3d611f80a1b8888b9001e1738f24194c694a8bf4 (diff) | |
| download | mediapointer-dvb-s2-29dbbb60b1b22bd956e7fc25a2b2d1a9ea577f79.tar.gz mediapointer-dvb-s2-29dbbb60b1b22bd956e7fc25a2b2d1a9ea577f79.tar.bz2 | |
Merging mkrufky pvrusb2 tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l/Makefile')
| -rw-r--r-- | v4l/Makefile | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index d90e4b8ae..cf22a1125 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -122,7 +122,7 @@ obj-$(CONFIG_DVB_FRONTENDS) += dvb-pll.o cx22702.o or51132.o lgdt330x.o \ dib3000-common.o dib3000mb.o dib3000mc.o \ ves1820.o cx22700.o tda8083.o ves1x93.o \ stv0297.o sp8870.o l64781.o s5h1420.o \ - tda10021.o at76c651.o tda80xx.o + tda10021.o at76c651.o tda80xx.o zl10353.o obj-$(CONFIG_DVB_CORE) += dvb-core.o obj-$(CONFIG_DVB_B2C2_FLEXCOP) += b2c2-flexcop.o obj-$(CONFIG_DVB_B2C2_FLEXCOP) += stv0297_cs2.o @@ -187,6 +187,7 @@ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) EXTRA_CFLAGS += -DHAVE_OR51132=1 EXTRA_CFLAGS += -DHAVE_LGDT330X=1 EXTRA_CFLAGS += -DHAVE_MT352=1 + EXTRA_CFLAGS += -DHAVE_ZL10353=1 EXTRA_CFLAGS += -DHAVE_NXT200X=1 EXTRA_CFLAGS += -DHAVE_CX24123=1 EXTRA_CFLAGS += -DHAVE_VP3054_I2C=1 @@ -216,6 +217,11 @@ $(obj)/av7110_firm.h: $(obj)/fdump EXTRA_CFLAGS += -DCONFIG_DVB_AV7110_FIRMWARE_FILE endif +ifeq ($(ARCH),) +ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ + -e s/arm.*/arm/ -e s/sa110/arm/ \ + -e s/s390x/s390/ -e s/parisc64/parisc/ ) +endif ################################################# # compile modules @@ -316,7 +322,7 @@ inst_frontends += nxt200x.ko cx24123.ko mt312.ko stv0299.ko inst_frontends += bcm3510.ko dib3000mb.ko dib3000mc.ko ves1820.ko inst_frontends += cx22700.ko tda8083.ko ves1x93.ko stv0297.ko sp8870.ko inst_frontends += l64781.ko s5h1420.ko tda10021.ko at76c651.ko tda80xx.ko -inst_frontends += stv0297_cs2.ko +inst_frontends += stv0297_cs2.ko zl10353.ko inst_dvb-core := dvb-core.ko inst_saa7146 := saa7146.ko saa7146_vv.ko inst_b2c2 := b2c2-flexcop.ko b2c2-flexcop-pci.ko b2c2-flexcop-usb.ko @@ -345,6 +351,10 @@ all:: default default:: links .version $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) $(MYCFLAGS) modules +qconfig:: links .version + ./scripts/make_kconfig.pl /usr/src/linux-2.6.14 $(ARCH) + $(KDIR)/scripts/kconfig/qconf Kconfig + ivtv-checkout:: @if [ ! -d ivtv ]; then \ echo retrieving the latest ivtv sources from ivtvdriver.org; \ @@ -518,7 +528,9 @@ 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 + -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump \ + ivtv-svnversion.h \ + Kconfig Kconfig.kern .config .config.cmd distclean:: clean -rm -f .version .*.o.flags .*.o.d |