Commit 85d14318 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarJaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b591b6e9

sound/core/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -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

sound/core/info.c

+0 −8
Original line number Diff line number Diff line
@@ -33,12 +33,6 @@ 
#include <linux/mutex.h>

#include <stdarg.h>



/*

 *

 */



#ifdef CONFIG_PROC_FS



int snd_info_check_reserved_words(const char *str)

{

	static char *reserved[] =
@@ -850,5 +844,3 @@ static int __init snd_info_version_init(void) 
	entry->c.text.read = snd_info_version_read;

	return snd_info_register(entry); /* freed in error path */

}
 


#endif /* CONFIG_PROC_FS */

sound/core/info_oss.c

+0 −4
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ 
#include <linux/utsname.h>

#include <linux/mutex.h>



#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS)



/*

 *  OSS compatible part

 */
@@ -134,5 +132,3 @@ int snd_info_minor_unregister(void) 
	snd_sndstat_proc_entry = NULL;

	return 0;

}
 


#endif /* CONFIG_SND_OSSEMUL */

sound/core/seq/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ 
snd-seq-device-objs := seq_device.o

snd-seq-objs := seq.o seq_lock.o seq_clientmgr.o seq_memory.o seq_queue.o \

                seq_fifo.o seq_prioq.o seq_timer.o \

                seq_system.o seq_ports.o seq_info.o

                seq_system.o seq_ports.o

snd-seq-$(CONFIG_PROC_FS) += seq_info.o

snd-seq-midi-objs := seq_midi.o

snd-seq-midi-emul-objs := seq_midi_emul.o

snd-seq-midi-event-objs := seq_midi_event.o

sound/core/seq/seq_info.c

+0 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include "seq_clientmgr.h"

#include "seq_timer.h"



#ifdef CONFIG_PROC_FS

static struct snd_info_entry *queues_entry;

static struct snd_info_entry *clients_entry;

static struct snd_info_entry *timer_entry;
@@ -80,4 +79,3 @@ int __exit snd_seq_info_done(void) 
	free_info_entries();

	return 0;

}
 
#endif