diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-06-28 02:13:41 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-06-28 02:45:07 -0400 |
commit | f03293d8fc97f07dbe4c54ce495c8dac172dc6e1 (patch) | |
tree | d072c2d84c4609c331be9c566255836427a986ee | |
parent | b602aa8eb1a0f52f0f9a09728b3b1c9133136656 (diff) |
ALSA: Fix forgotten dependency fix for tristate OSS sequencer kconfig
In the commit 3d774d5ef066 ("ALSA: seq: Allow the tristate build of
OSS emulation") we changed CONFIG_SND_SEQUENCER_OSS to tristate, but a
couple of places were forgotten, namely, opl3 and emux Makefile.
These contain the line like
snd-opl3-synth-$(CONFIG_SND_SEQUENCER_OSS) += opl3_oss.o
and this doesn't work any longer as expected because snd-opl3-synth
can be built-in while CONFIG_SND_SEQUENCER_OSS=m.
This patch fixes these places to build properly for the new kconfig
dependency. In the end, we had to use ifneq() to satisfy the
requirement. It's a bit ugly, but lesser evil.
Fixes: 3d774d5ef066 ("ALSA: seq: Allow the tristate build of OSS emulation")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/drivers/opl3/Makefile | 4 | ||||
-rw-r--r-- | sound/synth/emux/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sound/drivers/opl3/Makefile b/sound/drivers/opl3/Makefile index 7f2c2a10c4e5..d72b1e7b51c4 100644 --- a/sound/drivers/opl3/Makefile +++ b/sound/drivers/opl3/Makefile | |||
@@ -5,7 +5,9 @@ | |||
5 | 5 | ||
6 | snd-opl3-lib-objs := opl3_lib.o opl3_synth.o | 6 | snd-opl3-lib-objs := opl3_lib.o opl3_synth.o |
7 | snd-opl3-synth-y := opl3_seq.o opl3_midi.o opl3_drums.o | 7 | snd-opl3-synth-y := opl3_seq.o opl3_midi.o opl3_drums.o |
8 | snd-opl3-synth-$(CONFIG_SND_SEQUENCER_OSS) += opl3_oss.o | 8 | ifneq ($(CONFIG_SND_SEQUENCER_OSS),) |
9 | snd-opl3-synth-y += opl3_oss.o | ||
10 | endif | ||
9 | 11 | ||
10 | obj-$(CONFIG_SND_OPL3_LIB) += snd-opl3-lib.o | 12 | obj-$(CONFIG_SND_OPL3_LIB) += snd-opl3-lib.o |
11 | obj-$(CONFIG_SND_OPL4_LIB) += snd-opl3-lib.o | 13 | obj-$(CONFIG_SND_OPL4_LIB) += snd-opl3-lib.o |
diff --git a/sound/synth/emux/Makefile b/sound/synth/emux/Makefile index 4599108452fd..d1bac923eb1b 100644 --- a/sound/synth/emux/Makefile +++ b/sound/synth/emux/Makefile | |||
@@ -6,6 +6,8 @@ | |||
6 | snd-emux-synth-objs := emux.o emux_synth.o emux_seq.o emux_nrpn.o \ | 6 | snd-emux-synth-objs := emux.o emux_synth.o emux_seq.o emux_nrpn.o \ |
7 | emux_effect.o emux_hwdep.o soundfont.o | 7 | emux_effect.o emux_hwdep.o soundfont.o |
8 | snd-emux-synth-$(CONFIG_SND_PROC_FS) += emux_proc.o | 8 | snd-emux-synth-$(CONFIG_SND_PROC_FS) += emux_proc.o |
9 | snd-emux-synth-$(CONFIG_SND_SEQUENCER_OSS) += emux_oss.o | 9 | ifneq ($(CONFIG_SND_SEQUENCER_OSS),) |
10 | snd-emux-synth-y += emux_oss.o | ||
11 | endif | ||
10 | 12 | ||
11 | obj-$(CONFIG_SND_SYNTH_EMUX) += snd-emux-synth.o | 13 | obj-$(CONFIG_SND_SYNTH_EMUX) += snd-emux-synth.o |