summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-08-31 17:52:53 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-08-31 17:52:53 -0300
commit49ba52cb46919c8a46c318e77edd1845b9f51178 (patch)
tree1e45bb4763a9773d00f4acebf38cc81632dc8b33 /v4l
parent80206e1d4a136a8dc87abd8cf94882ea4a7483b0 (diff)
downloadmediapointer-dvb-s2-49ba52cb46919c8a46c318e77edd1845b9f51178.tar.gz
mediapointer-dvb-s2-49ba52cb46919c8a46c318e77edd1845b9f51178.tar.bz2
Allow compilation of the audio drivers
From: Mauro Carvalho Chehab <mchehab@infradead.org> Now, make will compile also the audio drivers at the tree. By default, they will not be installed. A new option were added to install those files: make sound-install Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/Makefile5
-rw-r--r--v4l/Makefile.sound24
-rwxr-xr-xv4l/scripts/make_kconfig.pl1
3 files changed, 30 insertions, 0 deletions
diff --git a/v4l/Makefile b/v4l/Makefile
index 3e9336a95..bed3a0e42 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -39,6 +39,7 @@ default:: config-compat.h Makefile.media links .version
-include $(obj)/.myconfig
-include $(obj)/Makefile.media
+-include $(obj)/Makefile.sound
-include $(obj)/Makefile.ivtv
#################################################
@@ -52,6 +53,10 @@ ifeq ($(CONFIG_DVB_FIRESAT),m)
EXTRA_CFLAGS += -I$(srctree)/drivers/ieee1394/
endif
+ifeq ($(CONFIG_SOUND_ACI_MIXER),m)
+ EXTRA_CFLAGS += -I$(srctree)/sound/oss/
+endif
+
EXTRA_CFLAGS += -g
EXTRA_CFLAGS += $(if $(wildcard $(srctree)/.mm), -DMM_KERNEL)
diff --git a/v4l/Makefile.sound b/v4l/Makefile.sound
index 157a75ec4..0f218b78b 100644
--- a/v4l/Makefile.sound
+++ b/v4l/Makefile.sound
@@ -12,3 +12,27 @@ obj-$(CONFIG_SOUND_BT878) += btaudio.o
snd-tea575x-tuner-objs := tea575x-tuner.o
obj-$(CONFIG_SND_FM801_TEA575X) += snd-tea575x-tuner.o
+KDIRA := /lib/modules/$(KERNELRELEASE)/kernel
+
+
+sound-install install-sound::
+ @dir="sound/pci"; \
+ files='snd-bt87x.ko'; \
+ echo -e "\nInstalling $(KDIRA)/$$dir files:"; \
+ install -d $(KDIRA)/$$dir; \
+ for i in $$files;do if [ -e $$i ]; then echo -n "$$i "; \
+ install -m 644 -c $$i $(KDIRA)/$$dir; fi; done; echo;
+
+ @dir="sound/oss"; \
+ files='aci.ko btaudio.ko'; \
+ echo -e "\nInstalling $(KDIRA)/$$dir files:"; \
+ install -d $(KDIRA)/$$dir; \
+ for i in $$files;do if [ -e $$i ]; then echo -n "$$i "; \
+ install -m 644 -c $$i $(KDIRA)/$$dir; fi; done; echo;
+
+ @dir="sound/i2c/other"; \
+ files='snd-tea575x-tuner.ko'; \
+ echo -e "\nInstalling $(KDIRA)/$$dir files:"; \
+ install -d $(KDIRA)/$$dir; \
+ for i in $$files;do if [ -e $$i ]; then echo -n "$$i "; \
+ install -m 644 -c $$i $(KDIRA)/$$dir; fi; done; echo;
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index c44914501..1f286564a 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -377,6 +377,7 @@ config VIDEO_KERNEL_VERSION
EOF
open_kconfig ("../linux","../linux/drivers/media/Kconfig");
+open_kconfig (".","./Kconfig.sound");
print OUT "source Kconfig.sound\n";
close OUT;