Commit 4ef27920 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/seq-kconfig-cleanup' into for-linus 

* topic/seq-kconfig-cleanup:
  ALSA: clean up the logic for building sequencer modules
parents 1282c824 0528c749

sound/core/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -205,3 +205,5 @@ config SND_PCM_XRUN_DEBUG 




config SND_VMASTER

config SND_VMASTER

	bool

	bool



source "sound/core/seq/Kconfig"

sound/core/seq/Kconfig

0 → 100644
+16 −0
Original line number Original line Diff line number Diff line 
# define SND_XXX_SEQ to min(SND_SEQUENCER,SND_XXX)



config SND_RAWMIDI_SEQ

	def_tristate SND_SEQUENCER && SND_RAWMIDI



config SND_OPL3_LIB_SEQ

	def_tristate SND_SEQUENCER && SND_OPL3_LIB



config SND_OPL4_LIB_SEQ

	def_tristate SND_SEQUENCER && SND_OPL4_LIB



config SND_SBAWE_SEQ

	def_tristate SND_SEQUENCER && SND_SBAWE



config SND_EMU10K1_SEQ

	def_tristate SND_SEQUENCER && SND_EMU10K1

sound/core/seq/Makefile

+5 −13
Original line number Original line Diff line number Diff line
@@ -17,14 +17,6 @@ snd-seq-midi-event-objs := seq_midi_event.o 
snd-seq-dummy-objs := seq_dummy.o

snd-seq-dummy-objs := seq_dummy.o

snd-seq-virmidi-objs := seq_virmidi.o

snd-seq-virmidi-objs := seq_virmidi.o





#

# this function returns:

#   "m" - CONFIG_SND_SEQUENCER is m

#   <empty string> - CONFIG_SND_SEQUENCER is undefined

#   otherwise parameter #1 value

#

sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1)))



obj-$(CONFIG_SND_SEQUENCER) += snd-seq.o snd-seq-device.o

obj-$(CONFIG_SND_SEQUENCER) += snd-seq.o snd-seq-device.o

ifeq ($(CONFIG_SND_SEQUENCER_OSS),y)

ifeq ($(CONFIG_SND_SEQUENCER_OSS),y)

obj-$(CONFIG_SND_SEQUENCER) += snd-seq-midi-event.o

obj-$(CONFIG_SND_SEQUENCER) += snd-seq-midi-event.o
@@ -33,8 +25,8 @@ obj-$(CONFIG_SND_SEQ_DUMMY) += snd-seq-dummy.o 




# Toplevel Module Dependency

# Toplevel Module Dependency

obj-$(CONFIG_SND_VIRMIDI) += snd-seq-virmidi.o snd-seq-midi-event.o

obj-$(CONFIG_SND_VIRMIDI) += snd-seq-virmidi.o snd-seq-midi-event.o

obj-$(call sequencer,$(CONFIG_SND_RAWMIDI)) += snd-seq-midi.o snd-seq-midi-event.o

obj-$(CONFIG_SND_RAWMIDI_SEQ) += snd-seq-midi.o snd-seq-midi-event.o

obj-$(call sequencer,$(CONFIG_SND_OPL3_LIB)) += snd-seq-midi-event.o snd-seq-midi-emul.o

obj-$(CONFIG_SND_OPL3_LIB_SEQ) += snd-seq-midi-event.o snd-seq-midi-emul.o

obj-$(call sequencer,$(CONFIG_SND_OPL4_LIB)) += snd-seq-midi-event.o snd-seq-midi-emul.o

obj-$(CONFIG_SND_OPL4_LIB_SEQ) += snd-seq-midi-event.o snd-seq-midi-emul.o

obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += snd-seq-midi-emul.o snd-seq-virmidi.o

obj-$(CONFIG_SND_SBAWE_SEQ) += snd-seq-midi-emul.o snd-seq-virmidi.o

obj-$(call sequencer,$(CONFIG_SND_EMU10K1)) += snd-seq-midi-emul.o snd-seq-virmidi.o
 
obj-$(CONFIG_SND_EMU10K1_SEQ) += snd-seq-midi-emul.o snd-seq-virmidi.o

sound/drivers/opl3/Makefile

+1 −9
Original line number Original line Diff line number Diff line
@@ -7,14 +7,6 @@ snd-opl3-lib-objs := opl3_lib.o opl3_synth.o 
snd-opl3-synth-y := opl3_seq.o opl3_midi.o opl3_drums.o

snd-opl3-synth-y := opl3_seq.o opl3_midi.o opl3_drums.o

snd-opl3-synth-$(CONFIG_SND_SEQUENCER_OSS) += opl3_oss.o

snd-opl3-synth-$(CONFIG_SND_SEQUENCER_OSS) += opl3_oss.o





#

# this function returns:

#   "m" - CONFIG_SND_SEQUENCER is m

#   <empty string> - CONFIG_SND_SEQUENCER is undefined

#   otherwise parameter #1 value

#

sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1)))



obj-$(CONFIG_SND_OPL3_LIB) += snd-opl3-lib.o

obj-$(CONFIG_SND_OPL3_LIB) += snd-opl3-lib.o

obj-$(CONFIG_SND_OPL4_LIB) += snd-opl3-lib.o

obj-$(CONFIG_SND_OPL4_LIB) += snd-opl3-lib.o

obj-$(call sequencer,$(CONFIG_SND_OPL3_LIB)) += snd-opl3-synth.o
 
obj-$(CONFIG_SND_OPL3_LIB_SEQ) += snd-opl3-synth.o

sound/drivers/opl4/Makefile

+1 −9
Original line number Original line Diff line number Diff line
@@ -6,13 +6,5 @@ 
snd-opl4-lib-objs := opl4_lib.o opl4_mixer.o opl4_proc.o

snd-opl4-lib-objs := opl4_lib.o opl4_mixer.o opl4_proc.o

snd-opl4-synth-objs := opl4_seq.o opl4_synth.o yrw801.o

snd-opl4-synth-objs := opl4_seq.o opl4_synth.o yrw801.o





#

# this function returns:

#   "m" - CONFIG_SND_SEQUENCER is m

#   <empty string> - CONFIG_SND_SEQUENCER is undefined

#   otherwise parameter #1 value

#

sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1)))



obj-$(CONFIG_SND_OPL4_LIB) += snd-opl4-lib.o

obj-$(CONFIG_SND_OPL4_LIB) += snd-opl4-lib.o

obj-$(call sequencer,$(CONFIG_SND_OPL4_LIB)) += snd-opl4-synth.o
 
obj-$(CONFIG_SND_OPL4_LIB_SEQ) += snd-opl4-synth.o