patch-2.3.50 linux/drivers/sound/Makefile

• Lines: 150
• Date: Tue Mar 7 13:40:24 2000
• Orig file: v2.3.49/linux/drivers/sound/Makefile
• Orig date: Sat Feb 26 22:31:49 2000

diff -u --recursive --new-file v2.3.49/linux/drivers/sound/Makefile linux/drivers/sound/Makefile
@@ -23,7 +23,7 @@
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 
 export-objs	:=  ad1848.o audio_syms.o midi_syms.o mpu401.o \
-		    msnd.o opl3.o sb_card.o sequencer_syms.o \
+		    msnd.o opl3.o sb_common.o sequencer_syms.o \
 		    sound_core.o sound_syms.o uart401.o ad1816.o \
 		    nm256_audio.o ac97.o ac97_codec.o
 
@@ -45,39 +45,36 @@
 obj-$(CONFIG_SOUND_OSS)		+= sound.o
 obj-$(CONFIG_SOUND_CS4232)	+= cs4232.o ad1848.o 
 
-# In theory, there's probably no reason to include the uart401 code
-# to support a WaveFront card's CS4232 module. However, it makes
-# reconfiguring things require a recompile, so just leave this
-# here and try not to worry about the extra uart401 module.
+# Please leave it as is, cause the link order is significant !
 
-obj-$(CONFIG_SOUND_CS4232)	+= uart401.o
+obj-$(CONFIG_SOUND_PSS)		+= pss.o ad1848.o mpu401.o
+obj-$(CONFIG_SOUND_TRIX)	+= trix.o ad1848.o sb_lib.o uart401.o
+obj-$(CONFIG_SOUND_OPL3SA1)     += opl3sa.o ad1848.o uart401.o
+obj-$(CONFIG_SOUND_SOFTOSS)     += softoss2.o
+obj-$(CONFIG_SOUND_SSCAPE)      += sscape.o ad1848.o mpu401.o
+obj-$(CONFIG_SOUND_MAD16)       += mad16.o ad1848.o sb_lib.o uart401.o
+obj-$(CONFIG_SOUND_CS4232)	+= cs4232.o uart401.o
+obj-$(CONFIG_SOUND_OPL3SA2)     += opl3sa2.o ad1848.o uart401.o mpu401.o
+obj-$(CONFIG_SOUND_MSS)         += ad1848.o
+obj-$(CONFIG_SOUND_PAS)         += pas2.o sb_lib.o uart401.o
+obj-$(CONFIG_SOUND_SB)          += sb.o sb_lib.o uart401.o
+obj-$(CONFIG_SOUND_WAVEFRONT)   += wavefront.o
+obj-$(CONFIG_SOUND_MAUI)        += maui.o mpu401.o
+obj-$(CONFIG_SOUND_MPU401)      += mpu401.o
+obj-$(CONFIG_SOUND_UART6850)    += uart6850.o
 obj-$(CONFIG_SOUND_GUS)		+= gus.o ad1848.o
-obj-$(CONFIG_SOUND_MAD16)	+= mad16.o ad1848.o sb.o uart401.o
-obj-$(CONFIG_SOUND_VIA82CXXX)	+= via82cxxx_audio.o sb.o uart401.o ac97.o
-obj-$(CONFIG_SOUND_MAUI)	+= maui.o mpu401.o
-obj-$(CONFIG_SOUND_MPU401)	+= mpu401.o
+obj-$(CONFIG_SOUND_YM3812)      += adlib_card.o opl3.o
+obj-$(CONFIG_SOUND_VMIDI)       += v_midi.o
+obj-$(CONFIG_SOUND_VIDC)        += vidc_mod.o
+obj-$(CONFIG_SOUND_WAVEARTIST)  += waveartist.o
+obj-$(CONFIG_SOUND_SGALAXY)     += sgalaxy.o ad1848.o
+obj-$(CONFIG_SOUND_AD1816)      += ad1816.o
+
+obj-$(CONFIG_SOUND_VIA82CXXX)	+= via82cxxx_audio.o sb_lib.o uart401.o ac97.o
 obj-$(CONFIG_SOUND_MSNDCLAS)	+= msnd.o msnd_classic.o
 obj-$(CONFIG_SOUND_MSNDPIN)	+= msnd.o msnd_pinnacle.o
-obj-$(CONFIG_SOUND_MSS)		+= ad1848.o
-obj-$(CONFIG_SOUND_OPL3SA1)	+= opl3sa.o ad1848.o uart401.o
-obj-$(CONFIG_SOUND_OPL3SA2)	+= opl3sa2.o ad1848.o uart401.o mpu401.o
-obj-$(CONFIG_SOUND_PAS)		+= pas2.o sb.o uart401.o
-obj-$(CONFIG_SOUND_PSS)		+= pss.o ad1848.o mpu401.o
-obj-$(CONFIG_SOUND_SB)		+= sb.o uart401.o
-obj-$(CONFIG_SOUND_SOFTOSS)	+= softoss2.o
-obj-$(CONFIG_SOUND_SGALAXY)	+= sgalaxy.o ad1848.o
-obj-$(CONFIG_SOUND_AD1816)	+= ad1816.o
-obj-$(CONFIG_SOUND_SSCAPE)	+= sscape.o ad1848.o mpu401.o
-obj-$(CONFIG_SOUND_TRIX)	+= trix.o ad1848.o sb.o uart401.o
-obj-$(CONFIG_SOUND_UART6850)	+= uart6850.o
-obj-$(CONFIG_SOUND_VMIDI)	+= v_midi.o
-obj-$(CONFIG_SOUND_YM3812)	+= adlib_card.o opl3.o
-obj-$(CONFIG_SOUND_VIDC)	+= vidc_mod.o
 obj-$(CONFIG_SOUND_VWSND)	+= vwsnd.o
-obj-$(CONFIG_SOUND_WAVEARTIST)	+= waveartist.o
-obj-$(CONFIG_SOUND_WAVEFRONT)   += wavefront.o
-obj-$(CONFIG_SOUND_NM256)	+= nm256.o
-
+obj-$(CONFIG_SOUND_NM256)	+= nm256_audio.o ac97.o
 obj-$(CONFIG_SOUND_SONICVIBES)	+= sonicvibes.o
 obj-$(CONFIG_SOUND_CMPCI)	+= cmpci.o
 obj-$(CONFIG_SOUND_ES1370)	+= es1370.o
@@ -89,7 +86,7 @@
 # Declare multi-part drivers.
 
 list-multi	:= sound.o gus.o pas2.o sb.o softoss2.o vidc_mod.o \
-    soundcore.o wavefront.o nm256.o
+    soundcore.o wavefront.o
 
 sound-objs	:= 							\
     dev_table.o soundcard.o sound_syms.o		\
@@ -101,12 +98,11 @@
 
 gus-objs	:= gus_card.o gus_midi.o gus_vol.o gus_wave.o ics2101.o
 pas2-objs	:= pas2_card.o pas2_midi.o pas2_mixer.o pas2_pcm.o
-sb-objs		:= sb_audio.o sb_card.o sb_common.o sb_midi.o sb_mixer.o	\
-			   sb_ess.o
+sb-objs		:= sb_card.o
+sb_lib-objs	:= sb_common.o sb_audio.o sb_midi.o sb_mixer.o sb_ess.o
 softoss2-objs	:= softoss.o softoss_rs.o
 vidc_mod-objs	:= vidc.o vidc_fill.o
 wavefront-objs  := wavfront.o wf_midi.o yss225.o
-nm256-objs	:= nm256_audio.o ac97.o
 
 
 # Extract lists of the multi-part drivers.
@@ -125,20 +121,6 @@
 int-m		:= $(filter-out $(int-y), $(int-m))
 
 
-
-# Set flags for secondary drivers.
-# I have to do this before I reduce obj-y to components.
-
-EXTRA_CFLAGS	:= $(sort					\
-    $(patsubst ad1848.o,  -DCONFIG_SOUND_AD1848,		\
-    $(patsubst mpu401.o,  -DCONFIG_SOUND_MPU_EMU,		\
-    $(patsubst sb.o,      -DCONFIG_SOUND_SBDSP,			\
-    $(patsubst uart401.o, -DCONFIG_SOUND_UART401,		\
-	$(filter ad1848.o mpu401.o sb.o uart401.o, $(obj-y))	\
-    )))))
-
-
-
 # Take multi-part drivers out of obj-y and put components in.
 
 obj-y		:= $(filter-out $(list-multi), $(obj-y)) $(int-y)
@@ -155,8 +137,8 @@
 OX_OBJS		:= $(filter     $(export-objs), $(obj-y))
 M_OBJS		:= $(sort $(filter-out $(export-objs), $(obj-m)))
 MX_OBJS		:= $(sort $(filter     $(export-objs), $(obj-m)))
-MI_OBJS		:= $(sort $(filter-out $(export-objs), $(int-m)))
-MIX_OBJS	:= $(sort $(filter     $(export-objs), $(int-m)))
+#MI_OBJS		:= $(sort $(filter-out $(export-objs), $(int-m)))
+#MIX_OBJS	:= $(sort $(filter     $(export-objs), $(int-m)))
 
 ifeq ($(CONFIG_LOWLEVEL_SOUND),y)
     O_OBJS	+= lowlevel/lowlevel.o
@@ -183,6 +165,9 @@
 sb.o: $(sb-objs)
 	$(LD) -r -o $@ $(sb-objs)
 
+sb_lib.o: $(sb_lib-objs)
+	$(LD) -r -o $@ $(sb_lib-objs)
+
 softoss2.o: $(softoss2-objs)
 	$(LD) -r -o $@ $(softoss2-objs)
 
@@ -191,9 +176,6 @@
 
 wavefront.o: $(wavefront-objs)
 	$(LD) -r -o $@ $(wavefront-objs)
-
-nm256.o: $(nm256-objs)
-	$(LD) -r -o $@ $(nm256-objs)
 
 # Firmware files that need translation
 #