patch-2.1.110 linux/drivers/sound/Makefile

• Lines: 67
• Date: Mon Jul 20 10:05:16 1998
• Orig file: v2.1.109/linux/drivers/sound/Makefile
• Orig date: Thu Jul 16 18:09:26 1998

diff -u --recursive --new-file v2.1.109/linux/drivers/sound/Makefile linux/drivers/sound/Makefile
@@ -49,7 +49,14 @@
 obj-$(CONFIG_SOUND)		+= soundcore.o
 obj-$(CONFIG_SOUND_OSS)		+= sound.o
 obj-$(CONFIG_SOUND_ADLIB)	+= adlib_card.o opl3.o
-obj-$(CONFIG_SOUND_CS4232)	+= cs4232.o ad1848.o uart401.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.
+
+obj-$(CONFIG_SOUND_CS4232)	+= uart401.o
 obj-$(CONFIG_SOUND_GUS)		+= gus.o ad1848.o
 obj-$(CONFIG_SOUND_MAD16)	+= mad16.o ad1848.o sb.o uart401.o
 obj-$(CONFIG_SOUND_MAUI)	+= maui.o mpu401.o
@@ -69,7 +76,7 @@
 obj-$(CONFIG_SOUND_VMIDI)	+= v_midi.o
 obj-$(CONFIG_SOUND_YM3812)	+= adlib_card.o opl3.o
 obj-$(CONFIG_VIDC_SOUND)	+= vidc_mod.o
-
+obj-$(CONFIG_SOUND_WAVEFRONT)   += wavefront.o
 #jnx
 obj-$(CONFIG_SOUND_ES1370)	+= es1370.o
 obj-$(CONFIG_SOUND_ES1371)	+= es1371.o
@@ -81,7 +88,8 @@
 
 # Declare multi-part drivers.
 
-list-multi	:= sound.o gus.o pas2.o sb.o softoss2.o vidc_mod.o soundcore.o
+list-multi	:= sound.o gus.o pas2.o sb.o softoss2.o vidc_mod.o \
+    soundcore.o wavefront.o
 
 sound-objs	:= 							\
     dev_table.o soundcard.o sound_syms.o		\
@@ -96,7 +104,7 @@
 sb-objs		:= sb_audio.o sb_card.o sb_common.o sb_midi.o sb_mixer.o
 softoss2-objs	:= softoss.o softoss_rs.o
 vidc_mod-objs	:= vidc.o vidc_audio.o vidc_fill.o vidc_mixer.o vidc_synth.o
-
+wavefront-objs  := wavfront.o wf_midi.o yss225.o
 
 
 # Extract lists of the multi-part drivers.
@@ -179,7 +187,8 @@
 vidc_mod.o: $(vidc_mod-objs)
 	$(LD) -r -o $@ $(vidc_mod-objs)
 
-
+wavefront.o: $(wavefront-objs)
+	$(LD) -r -o $@ $(wavefront-objs)
 
 # Firmware files that need translation
 #
@@ -190,10 +199,10 @@
 # First make the utilities.
 
 bin2hex: bin2hex.c
-	$(HOSTCC) -o bin2hex bin2hex.c
+	$(HOSTCC) $(HOSTCFLAGS) -o bin2hex bin2hex.c
 
 hex2hex: hex2hex.c
-	$(HOSTCC) -o hex2hex hex2hex.c
+	$(HOSTCC) $(HOSTCFLAGS) -o hex2hex hex2hex.c