patch-2.1.75 linux/drivers/sound/Makefile

• Lines: 55
• Date: Sun Dec 21 17:41:24 1997
• Orig file: v2.1.74/linux/drivers/sound/Makefile
• Orig date: Wed Dec 10 11:12:44 1997

diff -u --recursive --new-file v2.1.74/linux/drivers/sound/Makefile linux/drivers/sound/Makefile
@@ -90,18 +90,26 @@
 L_OBJS += gus.o
 else
   ifeq ($(CONFIG_GUS),m)
-  M_OBJS += gus.o
+    M_OBJS += gus.o
+  endif
+  ifeq ($(CONFIG_GUSMAX),m)
+    ifneq ($(CONFIG_MSS),y)
+      CONFIG_MSS = m
+    endif
   endif
 endif
 
 ifeq ($(CONFIG_SB),y)
 L_OBJS += sb_audio.o sb_common.o sb_midi.o sb_mixer.o
-LX_OBJS += sb_card.o uart401.o
+LX_OBJS += sb_card.o
+CONFIG_UART401 = y
 else
   ifeq ($(CONFIG_SB),m)
   M_OBJS += sb.o
-  MX_OBJS += uart401.o
   MIX_OBJS += sb_card.o
+  ifneq ($(CONFIG_UART401),y)
+    CONFIG_UART401 = m
+  endif
   endif
 endif
 
@@ -181,7 +189,8 @@
 L_OBJS += mad16.o
 else
   ifeq ($(CONFIG_MAD16),m)
-  M_OBJS += mad16.o
+  M_OBJS += mad16.o sb.o uart401.o
+  MX_OBJS += sb_card.o ad1848.o
   endif
 endif
 
@@ -217,6 +226,14 @@
   M_OBJS += opl3sa.o
   MX_OBJS += ad1848.o
   endif
+endif
+
+ifeq ($(CONFIG_VMIDI),y)
+L_OBJS += v_midi.o
+else
+   ifeq ($(CONFIG_VMIDI),m)
+      M_OBJS += v_midi.o
+   endif
 endif
 
 include $(TOPDIR)/Rules.make