Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: alsa-devel@alsa-project.org
Subject: [PATCH 4/5] ALSA: synth: Select snd-emux-synth explicitly
Date: Fri,  9 Jun 2017 17:12:51 +0200	[thread overview]
Message-ID: <20170609151252.704-5-tiwai@suse.de> (raw)
In-Reply-To: <20170609151252.704-1-tiwai@suse.de>

Instead of the non-standard way to enable the build of snd-emux-synth
module inside Makefile, rewrite Kconfig to select the item explicitly
from each driver (sbawe and emu10k1).  This is the standard way.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/Kconfig             | 2 ++
 sound/isa/Kconfig         | 1 +
 sound/pci/Kconfig         | 1 +
 sound/synth/Kconfig       | 2 ++
 sound/synth/emux/Makefile | 4 +---
 5 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 sound/synth/Kconfig

diff --git a/sound/Kconfig b/sound/Kconfig
index d2fadbec8d51..d7d2aac9542e 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -110,6 +110,8 @@ source "sound/soc/Kconfig"
 
 source "sound/x86/Kconfig"
 
+source "sound/synth/Kconfig"
+
 endif # SND
 
 menuconfig SOUND_PRIME
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index bf1ab340e2a7..ea8ecc5bb826 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -389,6 +389,7 @@ config SND_SBAWE_SEQ
 	def_tristate SND_SEQUENCER && SND_SBAWE
 	select SND_SEQ_MIDI_EMUL
 	select SND_SEQ_VIRMIDI
+	select SND_SYNTH_EMUX
 
 config SND_SB16_CSP
 	bool "Sound Blaster 16/AWE CSP support"
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index bc7acb489a43..9ac9326f28d6 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -482,6 +482,7 @@ config SND_EMU10K1_SEQ
 	def_tristate SND_SEQUENCER && SND_EMU10K1
 	select SND_SEQ_MIDI_EMUL
 	select SND_SEQ_VIRMIDI
+	select SND_SYNTH_EMUX
 
 config SND_EMU10K1X
 	tristate "Emu10k1X (Dell OEM Version)"
diff --git a/sound/synth/Kconfig b/sound/synth/Kconfig
new file mode 100644
index 000000000000..dfe8950e0556
--- /dev/null
+++ b/sound/synth/Kconfig
@@ -0,0 +1,2 @@
+config SND_SYNTH_EMUX
+	tristate
diff --git a/sound/synth/emux/Makefile b/sound/synth/emux/Makefile
index fb761c2c2b50..4599108452fd 100644
--- a/sound/synth/emux/Makefile
+++ b/sound/synth/emux/Makefile
@@ -8,6 +8,4 @@ snd-emux-synth-objs := emux.o emux_synth.o emux_seq.o emux_nrpn.o \
 snd-emux-synth-$(CONFIG_SND_PROC_FS) += emux_proc.o
 snd-emux-synth-$(CONFIG_SND_SEQUENCER_OSS) += emux_oss.o
 
-# Toplevel Module Dependencies
-obj-$(CONFIG_SND_SBAWE_SEQ) += snd-emux-synth.o
-obj-$(CONFIG_SND_EMU10K1_SEQ) += snd-emux-synth.o
+obj-$(CONFIG_SND_SYNTH_EMUX) += snd-emux-synth.o
-- 
2.13.1

  parent reply	other threads:[~2017-06-09 15:12 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-09 15:12 [PATCH 0/5] ALSA: Reorganize kconfig for sequencer stuff Takashi Iwai
2017-06-09 15:12 ` [PATCH 1/5] ALSA: Make CONFIG_SND_OSSEMUL user-selectable Takashi Iwai
2017-06-09 15:12 ` [PATCH 2/5] ALSA: seq: Allow the tristate build of OSS emulation Takashi Iwai
2017-06-09 20:13   ` Takashi Iwai
2017-06-09 15:12 ` [PATCH 3/5] ALSA: seq: Reorganize kconfig and build Takashi Iwai
2017-06-09 15:12 ` Takashi Iwai [this message]
2017-06-09 15:12 ` [PATCH 5/5] ALSA: seq: Allow the modular sequencer registration Takashi Iwai
2017-06-10 19:44   ` Takashi Iwai
2017-06-12  6:54     ` Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170609151252.704-5-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=alsa-devel@alsa-project.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox