Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2295/core
Modified Files:
Kconfig Makefile
Log Message:
Russell King <[EMAIL PROTECTED]>
This is part of a patch series to clean up sound/core/Makefile in Linux
2.6.4-rc1.
- Add "select SND_PCM" statements to appropriate Kconfig entries for
drivers whose configuration symbol is used to build snd-pcm,
snd-timer, and snd-page-alloc.
- Remove snd-pcm, snd-timer and snd-page-alloc from these in
sound/core/Makefile.
- Remove snd from these entries as well - all SND_xxx configuration
symbols depend on CONFIG_SND, so we won't even consider building
any of these drivers unless SND is already set to 'y' or 'm'.
Index: Kconfig
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/Kconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Kconfig 10 Jun 2003 14:07:20 -0000 1.2
+++ Kconfig 2 Mar 2004 16:42:36 -0000 1.3
@@ -3,9 +3,23 @@
tristate "Emulation for 32-bit applications"
depends on SND && (SPARC64 || PPC64 || X86_64 && IA32_EMULATION)
+config SND_TIMER
+ tristate
+
+config SND_PCM
+ tristate
+ select SND_TIMER
+
+config SND_HWDEP
+ tristate
+
+config SND_RAWMIDI
+ tristate
+
config SND_SEQUENCER
tristate "Sequencer support"
depends on SND
+ select SND_TIMER
help
Say 'Y' or 'M' to enable MIDI sequencer and router support. This feature
allows routing and enqueing MIDI events. Events can be processed at given
@@ -20,26 +34,27 @@
immediately.
config SND_OSSEMUL
- bool "OSS API emulation"
- depends on SND
- help
- Say 'Y' to enable OSS (Open Sound System) API emulation code.
+ bool
config SND_MIXER_OSS
tristate "OSS Mixer API"
- depends on SND_OSSEMUL && SND
+ depends on SND
+ select SND_OSSEMUL
help
Say 'Y' or 'M' to enable mixer OSS API emulation (/dev/mixer*).
config SND_PCM_OSS
tristate "OSS PCM (digital audio) API"
- depends on SND_OSSEMUL && SND
+ depends on SND
+ select SND_OSSEMUL
+ select SND_PCM
help
Say 'Y' or 'M' to enable digital audio (PCM) OSS API emulation (/dev/dsp*).
config SND_SEQUENCER_OSS
bool "OSS Sequencer API"
- depends on SND_OSSEMUL && SND_SEQUENCER
+ depends on SND_SEQUENCER
+ select SND_OSSEMUL
help
Say 'Y' to enable OSS sequencer emulation (both /dev/sequencer and
/dev/music interfaces).
@@ -47,6 +62,7 @@
config SND_RTCTIMER
tristate "RTC Timer support"
depends on SND && RTC
+ select SND_TIMER
help
Say 'Y' or 'M' to enable RTC timer support for ALSA. ALSA code uses RTC
timer as precise timing source and maps the RTC timer to the ALSA's timer
Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/Makefile,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Makefile 2 Mar 2004 15:32:35 -0000 1.49
+++ Makefile 2 Mar 2004 16:42:36 -0000 1.50
@@ -23,15 +23,14 @@
snd-hwdep-objs := hwdep.o
obj-$(CONFIG_SND) += snd.o
-ifeq ($(subst m,y,$(CONFIG_RTC)),y)
- obj-$(CONFIG_SND_RTCTIMER) += snd-timer.o
- obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o
-endif
-obj-$(CONFIG_SND_HWDEP) += snd-hwdep.o
+obj-$(CONFIG_SND_HWDEP) += snd-hwdep.o
+obj-$(CONFIG_SND_TIMER) += snd-timer.o
+obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o
+obj-$(CONFIG_SND_PCM) += snd-pcm.o snd-page-alloc.o
+obj-$(CONFIG_SND_RAWMIDI) += snd-rawmidi.o
-obj-$(CONFIG_SND_MIXER_OSS) += oss/
-obj-$(CONFIG_SND_PCM_OSS) += snd-pcm.o snd-timer.o snd-page-alloc.o oss/
-obj-$(CONFIG_SND_SEQUENCER) += snd-timer.o seq/
+obj-$(CONFIG_SND_OSSEMUL) += oss/
+obj-$(CONFIG_SND_SEQUENCER) += seq/
obj-$(CONFIG_SND_BIT32_EMUL) += ioctl32/
# Toplevel Module Dependency
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
