Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 52a6db82efe345af62aa72c6ce9dcb89a4d993b5

Authored by Takashi Iwai
Committed by Jaroslav Kysela
1 parent 8f11551b17
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[ALSA] Clean up Makefile 

Clean up Makefile using xxx- style instead of
ifeq(CONFIG_XXX,y).

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

Showing 5 changed files with 10 additions and 23 deletions Side-by-side Diff

... ... @@ -3,13 +3,9 @@
3 3 # Copyright (c) 1999,2001 by Jaroslav Kysela <perex@suse.cz>
4 4 #
5 5  
6   -snd-objs := sound.o init.o memory.o info.o control.o misc.o device.o
7   -ifeq ($(CONFIG_ISA_DMA_API),y)
8   -snd-objs += isadma.o
9   -endif
10   -ifeq ($(CONFIG_SND_OSSEMUL),y)
11   -snd-objs += sound_oss.o info_oss.o
12   -endif
  6 +snd-y := sound.o init.o memory.o info.o control.o misc.o device.o
  7 +snd-$(CONFIG_ISA_DMA_API) += isadma.o
  8 +snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o info_oss.o
13 9  
14 10 snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
15 11 pcm_memory.o
sound/drivers/opl3/Makefile
Diff comments   View file @ 52a6db8
... ... @@ -4,10 +4,8 @@
4 4 #
5 5  
6 6 snd-opl3-lib-objs := opl3_lib.o opl3_synth.o
7   -snd-opl3-synth-objs := opl3_seq.o opl3_midi.o opl3_drums.o
8   -ifeq ($(CONFIG_SND_SEQUENCER_OSS),y)
9   -snd-opl3-synth-objs += opl3_oss.o
10   -endif
  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
11 9  
12 10 #
13 11 # this function returns:
... ... @@ -7,9 +7,7 @@
7 7 snd-cs8427-objs := cs8427.o
8 8 snd-tea6330t-objs := tea6330t.o
9 9  
10   -ifeq ($(subst m,y,$(CONFIG_L3)),y)
11   - obj-$(CONFIG_L3) += l3/
12   -endif
  10 +obj-$(CONFIG_L3) += l3/
13 11  
14 12 obj-$(CONFIG_SND) += other/
15 13  
sound/pci/cs46xx/Makefile
Diff comments   View file @ 52a6db8
... ... @@ -3,10 +3,8 @@
3 3 # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
4 4 #
5 5  
6   -snd-cs46xx-objs := cs46xx.o cs46xx_lib.o
7   -ifeq ($(CONFIG_SND_CS46XX_NEW_DSP),y)
8   - snd-cs46xx-objs += dsp_spos.o dsp_spos_scb_lib.o
9   -endif
  6 +snd-cs46xx-y := cs46xx.o cs46xx_lib.o
  7 +snd-cs46xx-$(CONFIG_SND_CS46XX_NEW_DSP) += dsp_spos.o dsp_spos_scb_lib.o
10 8  
11 9 # Toplevel Module Dependency
12 10 obj-$(CONFIG_SND_CS46XX) += snd-cs46xx.o
sound/pci/cs5535audio/Makefile
Diff comments   View file @ 52a6db8
... ... @@ -2,11 +2,8 @@
2 2 # Makefile for cs5535audio
3 3 #
4 4  
5   -snd-cs5535audio-objs := cs5535audio.o cs5535audio_pcm.o
6   -
7   -ifeq ($(CONFIG_PM),y)
8   -snd-cs5535audio-objs += cs5535audio_pm.o
9   -endif
  5 +snd-cs5535audio-y := cs5535audio.o cs5535audio_pcm.o
  6 +snd-cs5535audio-$(CONFIG_PM) += cs5535audio_pm.o
10 7  
11 8 # Toplevel Module Dependency
12 9 obj-$(CONFIG_SND_CS5535AUDIO) += snd-cs5535audio.o