summaryrefslogtreecommitdiffstats
path: root/sound/core/Makefile
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-04-23 10:34:34 +0200
committerTakashi Iwai <tiwai@suse.de>2015-04-24 17:31:07 +0200
commit85d143180738475b89d76b18409c3125b01464e1 (patch)
tree5ed3cd2abb50eebcd6f7ae68dc42eab42d64235f /sound/core/Makefile
parentb591b6e9e99017137888e2e397f0ddd8adb77c5d (diff)
downloadlinux-85d143180738475b89d76b18409c3125b01464e1.tar.bz2
ALSA: core: Build conditionally and remove superfluous ifdefs
Minor cleanups of Makefile to build some codes conditionally so that a few ifdefs can be reduced. Acked-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/Makefile')
-rw-r--r--sound/core/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/core/Makefile b/sound/core/Makefile
index 4daf2f58261c..ae1d32b084fd 100644
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@ -3,9 +3,13 @@
# Copyright (c) 1999,2001 by Jaroslav Kysela <perex@perex.cz>
#
-snd-y := sound.o init.o memory.o info.o control.o misc.o device.o
+snd-y := sound.o init.o memory.o control.o misc.o device.o
+ifneq ($(CONFIG_PROC_FS),)
+snd-y += info.o
+snd-$(CONFIG_SND_OSSEMUL) += info_oss.o
+endif
snd-$(CONFIG_ISA_DMA_API) += isadma.o
-snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o info_oss.o
+snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o
snd-$(CONFIG_SND_VMASTER) += vmaster.o
snd-$(CONFIG_SND_KCTL_JACK) += ctljack.o
snd-$(CONFIG_SND_JACK) += jack.o