Remove list-multi in sound/*/Makefile

diff --git a/sound/Makefile b/sound/Makefile
index 2d056abf97b98912c5d17ee166db88e2c27d7994..1daaf910ba5563ef025e9fe1907989dbb2ab3748 100644 (file)
--- a/sound/Makefile
+++ b/sound/Makefile
@@ -49,13 +49,7 @@ ifeq ($(CONFIG_SND),y)
   obj-y += last.o
 endif
 
-list-multi      := soundcore.o
-
 soundcore-objs  := sound_core.o sound_firmware.o
 
 
 include $(TOPDIR)/Rules.make
-
-
-soundcore.o: $(soundcore-objs)
-       $(LD) -r -o $@ $(soundcore-objs)

diff --git a/sound/core/Makefile b/sound/core/Makefile
index 8835af24216c3ca54c1f881f9bbd0426b24991cb..0db699715317058b4270541f679a8306ccc83856 100644 (file)
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@ -7,8 +7,6 @@ O_TARGET     := core.o
 
 export-objs  := sound.o pcm.o pcm_lib.o rawmidi.o timer.o rtctimer.o hwdep.o
 
-list-multi   := snd.o snd-pcm.o snd-rawmidi.o snd-timer.o snd-rtctimer.o snd-hwdep.o
-
 snd-objs     := sound.o init.o isadma.o memory.o info.o control.o misc.o \
                 device.o wrappers.o
 ifeq ($(CONFIG_SND_OSSEMUL),y)
@@ -114,21 +112,3 @@ ifeq ($(CONFIG_SND_SB16_CSP),y)
 endif
 
 include $(TOPDIR)/Rules.make
-
-snd.o: $(snd-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-objs)
-
-snd-pcm.o: $(snd-pcm-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-pcm-objs)
-
-snd-rawmidi.o: $(snd-rawmidi-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-rawmidi-objs)
-
-snd-timer.o: $(snd-timer-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-timer-objs)
-
-snd-rtctimer.o: $(snd-rtctimer-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-rtctimer-objs)
-
-snd-hwdep.o: $(snd-hwdep-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-hwdep-objs)

diff --git a/sound/core/ioctl32/Makefile b/sound/core/ioctl32/Makefile
index 33377a3c4d109adea3d1fd142e92c69e254c3d7f..9177e10d807e3607f6a0478aabe89443ada12102 100644 (file)
--- a/sound/core/ioctl32/Makefile
+++ b/sound/core/ioctl32/Makefile
@@ -5,8 +5,6 @@
 
 O_TARGET     := _ioctl32.o
 
-list-multi   := snd-ioctl32.o
-
 snd-ioctl32-objs := ioctl32.o pcm32.o rawmidi32.o timer32.o hwdep32.o
 ifeq ($(CONFIG_SND_SEQUENCER),y)
   snd-ioctl32-objs += seq32.o
@@ -15,6 +13,3 @@ endif
 obj-$(CONFIG_SND_BIT32_EMUL) += snd-ioctl32.o
 
 include $(TOPDIR)/Rules.make
-
-snd-ioctl32.o: $(snd-ioctl32-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-ioctl32-objs)

diff --git a/sound/core/oss/Makefile b/sound/core/oss/Makefile
index 9db3df5a8b47a5a94a8f72fe234d227f8b1c849f..afc643bca7dfcd567e4c5cfac8dd6d1f38465411 100644 (file)
--- a/sound/core/oss/Makefile
+++ b/sound/core/oss/Makefile
@@ -7,8 +7,6 @@ O_TARGET     := oss.o
 
 export-objs  := mixer_oss.o
 
-list-multi   := snd-mixer-oss.o snd-pcm-oss.o
-
 snd-mixer-oss-objs := mixer_oss.o
 
 snd-pcm-oss-objs := pcm_oss.o pcm_plugin.o \
@@ -18,9 +16,3 @@ obj-$(CONFIG_SND_MIXER_OSS) += snd-mixer-oss.o
 obj-$(CONFIG_SND_PCM_OSS) += snd-pcm-oss.o
 
 include $(TOPDIR)/Rules.make
-
-snd-mixer-oss.o: $(snd-mixer-oss-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-mixer-oss-objs)
-
-snd-pcm-oss.o: $(snd-pcm-oss-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-pcm-oss-objs)

diff --git a/sound/core/seq/Makefile b/sound/core/seq/Makefile
index 07481aa792c69bec25dc1757de336bef5c35c6bf..486b6229c16450778ae83d2e551f6562562f7005 100644 (file)
--- a/sound/core/seq/Makefile
+++ b/sound/core/seq/Makefile
@@ -13,10 +13,6 @@ ifeq ($(CONFIG_SND_SEQUENCER_OSS),y)
   obj-y             += oss/oss.o
 endif
 
-list-multi   := snd-seq-device.o snd-seq.o snd-seq-midi.o snd-seq-midi-emul.o \
-               snd-seq-midi-event.o snd-seq-instr.o snd-seq-dummy.o \
-               snd-seq-virmidi.o
-
 export-objs  := seq_device.o seq.o seq_ports.o seq_instr.o seq_midi_emul.o \
                seq_midi_event.o seq_virmidi.o
 
@@ -82,27 +78,3 @@ obj-$(CONFIG_SND_TRIDENT) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-m
 obj-$(CONFIG_SND_YMFPCI) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o
 
 include $(TOPDIR)/Rules.make
-
-snd-seq-device.o: $(snd-seq-device-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-seq-device-objs)
-
-snd-seq.o: $(snd-seq-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-seq-objs)
-
-snd-seq-midi.o: $(snd-seq-midi-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-seq-midi-objs)
-
-snd-seq-midi-emul.o: $(snd-seq-midi-emul-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-seq-midi-emul-objs)
-
-snd-seq-midi-event.o: $(snd-seq-midi-event-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-seq-midi-event-objs)
-
-snd-seq-instr.o: $(snd-seq-instr-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-seq-instr-objs)
-
-snd-seq-dummy.o: $(snd-seq-dummy-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-seq-dummy-objs)
-
-snd-seq-virmidi.o: $(snd-seq-virmidi-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-seq-virmidi-objs)

diff --git a/sound/core/seq/instr/Makefile b/sound/core/seq/instr/Makefile
index 936a32ebda9de9f70e514500c8654096ab98a1c5..52ff0a83d5b1de98446c9d232a16d5635022bc67 100644 (file)
--- a/sound/core/seq/instr/Makefile
+++ b/sound/core/seq/instr/Makefile
@@ -5,9 +5,6 @@
 
 O_TARGET     := instr.o
 
-list-multi   := snd-ainstr-fm.o snd-ainstr-simple.o snd-ainstr-gf1.o \
-               snd-ainstr-iw.o
-
 export-objs  := ainstr_fm.o ainstr_simple.o ainstr_gf1.o ainstr_iw.o
 
 snd-ainstr-fm-objs := ainstr_fm.o
@@ -47,15 +44,3 @@ obj-$(CONFIG_SND_TRIDENT) += snd-ainstr-simple.o
 obj-$(CONFIG_SND_YMFPCI) += snd-ainstr-fm.o
 
 include $(TOPDIR)/Rules.make
-
-snd-ainstr-fm.o: $(snd-ainstr-fm-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-ainstr-fm-objs)
-
-snd-ainstr-simple.o: $(snd-ainstr-simple-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-ainstr-simple-objs)
-
-snd-ainstr-gf1.o: $(snd-ainstr-gf1-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-ainstr-gf1-objs)
-
-snd-ainstr-iw.o: $(snd-ainstr-iw-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-ainstr-iw-objs)

diff --git a/sound/core/seq/oss/Makefile b/sound/core/seq/oss/Makefile
index 5c1dfafae5635278ef34fd304788f13d614d9f27..c384e64e51872e4384f4b66b59730cec0ddbe370 100644 (file)
--- a/sound/core/seq/oss/Makefile
+++ b/sound/core/seq/oss/Makefile
@@ -5,8 +5,6 @@
 
 O_TARGET     := oss.o
 
-list-multi   := snd-seq-oss.o
-
 snd-seq-oss-objs  := seq_oss.o seq_oss_init.o seq_oss_timer.o seq_oss_ioctl.o \
                     seq_oss_event.o seq_oss_rw.o seq_oss_synth.o \
                     seq_oss_midi.o seq_oss_readq.o seq_oss_writeq.o
@@ -14,6 +12,3 @@ snd-seq-oss-objs  := seq_oss.o seq_oss_init.o seq_oss_timer.o seq_oss_ioctl.o \
 obj-$(CONFIG_SND_SEQUENCER_OSS) += snd-seq-oss.o
 
 include $(TOPDIR)/Rules.make
-
-snd-seq-oss.o: $(snd-seq-oss-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-seq-oss-objs)

diff --git a/sound/drivers/Makefile b/sound/drivers/Makefile
index 693d0befac106547c38d2f61a3ccb9ecfb0046d1..dfc12fd98f3bda40bd4a392c7cb19b339b979cd7 100644 (file)
--- a/sound/drivers/Makefile
+++ b/sound/drivers/Makefile
@@ -8,8 +8,6 @@ O_TARGET     := drivers.o
 subdir-y     := opl3 mpu401
 subdir-m     := $(subdir-y)
 
-list-multi   := snd-dummy.o snd-mtpav.o snd-serial-u16550.o snd-virmidi.o
-
 snd-dummy-objs := dummy.o
 snd-mtpav-objs := mtpav.o
 snd-serial-u16550-objs := serial-u16550.o
@@ -22,15 +20,3 @@ obj-$(CONFIG_SND_SERIAL_U16550) += snd-serial-u16550.o
 obj-$(CONFIG_SND_MTPAV) += snd-mtpav.o
 
 include $(TOPDIR)/Rules.make
-
-snd-dummy.o: $(snd-dummy-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-dummy-objs)
-
-snd-mtpav.o: $(snd-mtpav-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-mtpav-objs)
-
-snd-serial-u16550.o: $(snd-serial-u16550-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-serial-u16550-objs)
-
-snd-virmidi.o: $(snd-virmidi-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-virmidi-objs)

diff --git a/sound/drivers/mpu401/Makefile b/sound/drivers/mpu401/Makefile
index d21747f1cd30d354e04ac5071b5332edb38f4899..b989d7496d26c5f5ee8973a28aafc40971047de1 100644 (file)
--- a/sound/drivers/mpu401/Makefile
+++ b/sound/drivers/mpu401/Makefile
@@ -5,8 +5,6 @@
 
 O_TARGET     := _mpu401.o
 
-list-multi   := snd-mpu401.o snd-mpu401-uart.o
-
 export-objs  := mpu401_uart.o
 
 snd-mpu401-objs := mpu401.o
@@ -45,9 +43,3 @@ obj-$(CONFIG_SND_TRIDENT) += snd-mpu401-uart.o
 obj-$(CONFIG_SND_YMFPCI) += snd-mpu401-uart.o
 
 include $(TOPDIR)/Rules.make
-
-snd-mpu401.o: $(snd-mpu401-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-mpu401-objs)
-
-snd-mpu401-uart.o: $(snd-mpu401-uart-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-mpu401-uart-objs)

diff --git a/sound/drivers/opl3/Makefile b/sound/drivers/opl3/Makefile
index 371dfb9b1bfe86a8e05b2f3922feef1e6612b7f0..b5df27f62067f323c22aab1df77bc07d3c30bac1 100644 (file)
--- a/sound/drivers/opl3/Makefile
+++ b/sound/drivers/opl3/Makefile
@@ -5,8 +5,6 @@
 
 O_TARGET     := _opl3.o
 
-list-multi   := snd-opl3-lib.o snd-opl3-synth.o
-
 export-objs  := opl3_lib.o
 
 snd-opl3-lib-objs := opl3_lib.o opl3_synth.o
@@ -68,9 +66,3 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
 endif
 
 include $(TOPDIR)/Rules.make
-
-snd-opl3-lib.o: $(snd-opl3-lib-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-opl3-lib-objs)
-
-snd-opl3-synth.o: $(snd-opl3-synth-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-opl3-synth-objs)

diff --git a/sound/i2c/Makefile b/sound/i2c/Makefile
index b9c505fb552d8f22e2145ef4177fb4f39eb41c49..3ae7a38ab7e0a64e12249163a54151059f21a1a9 100644 (file)
--- a/sound/i2c/Makefile
+++ b/sound/i2c/Makefile
@@ -5,8 +5,6 @@
 
 O_TARGET     := _i2c.o
 
-list-multi   := snd-i2c.o snd-cs8427.o snd-tea6330t.o
-
 export-objs  := i2c.o cs8427.o tea6330t.o
 
 snd-i2c-objs := i2c.o
@@ -18,12 +16,3 @@ obj-$(CONFIG_SND_INTERWAVE_STB) += snd-tea6330t.o snd-i2c.o
 obj-$(CONFIG_SND_ICE1712) += snd-cs8427.o snd-i2c.o
 
 include $(TOPDIR)/Rules.make
-
-snd-i2c.o: $(snd-i2c-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-i2c-objs)
-
-snd-cs8427.o: $(snd-cs8427-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-cs8427-objs)
-
-snd-tea6330t.o: $(snd-tea6330t-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-tea6330t-objs)

diff --git a/sound/isa/Makefile b/sound/isa/Makefile
index 10e4b3212da10aed2991758f59eff5fe16122c26..6b6dcf6b6c91df3d0aef24ea67365aa402b485c1 100644 (file)
--- a/sound/isa/Makefile
+++ b/sound/isa/Makefile
@@ -8,9 +8,6 @@ O_TARGET     := isa.o
 subdir-y     := ad1816a ad1848 cs423x es1688 gus opti9xx sb wavefront
 subdir-m     := $(subdir-y)
 
-list-multi   := snd-als100.o snd-azt2320.o snd-cmi8330.o snd-dt0197h.o \
-               snd-es18xx.o snd-opl3sa2.o snd-sgalaxy.o
-
 snd-als100-objs := als100.o
 snd-azt2320-objs := azt2320.o
 snd-cmi8330-objs := cmi8330.o
@@ -29,24 +26,3 @@ obj-$(CONFIG_SND_OPL3SA2) += snd-opl3sa2.o
 obj-$(CONFIG_SND_SGALAXY) += snd-sgalaxy.o
 
 include $(TOPDIR)/Rules.make
-
-snd-als100.o: $(snd-als100-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-als100-objs)
-
-snd-azt2320.o: $(snd-azt2320-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-azt2320-objs)
-
-snd-cmi8330.o: $(snd-cmi8330-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-cmi8330-objs)
-
-snd-dt0197h.o: $(snd-dt0197h-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-dt0197h-objs)
-
-snd-es18xx.o: $(snd-es18xx-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-es18xx-objs)
-
-snd-opl3sa2.o: $(snd-opl3sa2-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-opl3sa2-objs)
-
-snd-sgalaxy.o: $(snd-sgalaxy-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-sgalaxy-objs)

diff --git a/sound/isa/ad1816a/Makefile b/sound/isa/ad1816a/Makefile
index f536e21480c7b4d5c40acba1f6ecfb7b97127910..3a874302eb4ebfc1ad69ee411886dd30d075c186 100644 (file)
--- a/sound/isa/ad1816a/Makefile
+++ b/sound/isa/ad1816a/Makefile
@@ -5,8 +5,6 @@
 
 O_TARGET     := _ad1816a.o
 
-list-multi   := snd-ad1816a-lib.o snd-ad1816a.o
-
 export-objs  := ad1816a_lib.o
 
 snd-ad1816a-lib-objs := ad1816a_lib.o
@@ -16,9 +14,3 @@ snd-ad1816a-objs := ad1816a.o
 obj-$(CONFIG_SND_AD1816A) += snd-ad1816a.o snd-ad1816a-lib.o
 
 include $(TOPDIR)/Rules.make
-
-snd-ad1816a-lib.o: $(snd-ad1816a-lib-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-ad1816a-lib-objs)
-
-snd-ad1816a.o: $(snd-ad1816a-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-ad1816a-objs)

diff --git a/sound/isa/ad1848/Makefile b/sound/isa/ad1848/Makefile
index 0586297894c6d4e225577f1a286a50d657a7ea3b..adaf120bd7ba333671218fecd720a9d9e6d7ca87 100644 (file)
--- a/sound/isa/ad1848/Makefile
+++ b/sound/isa/ad1848/Makefile
@@ -5,8 +5,6 @@
 
 O_TARGET     := _ad1848.o
 
-list-multi   := snd-ad1848-lib.o snd-ad1848.o
-
 export-objs  := ad1848_lib.o
 
 snd-ad1848-lib-objs := ad1848_lib.o
@@ -19,9 +17,3 @@ obj-$(CONFIG_SND_AD1848) += snd-ad1848.o snd-ad1848-lib.o
 obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-ad1848-lib.o
 
 include $(TOPDIR)/Rules.make
-
-snd-ad1848-lib.o: $(snd-ad1848-lib-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-ad1848-lib-objs)
-
-snd-ad1848.o: $(snd-ad1848-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-ad1848-objs)

diff --git a/sound/isa/cs423x/Makefile b/sound/isa/cs423x/Makefile
index 67a9bb724fcbfaf110297cca9dbd931e11d0ed39..1854680d04dd3052acda16dd21236f6aee4147e8 100644 (file)
--- a/sound/isa/cs423x/Makefile
+++ b/sound/isa/cs423x/Makefile
@@ -5,9 +5,6 @@
 
 O_TARGET     := _cs423x.o
 
-list-multi   := snd-cs4231-lib.o snd-cs4236-lib.o \
-               snd-cs4231.o snd-cs4232.o snd-cs4236.o
-
 export-objs  := cs4231_lib.o cs4236_lib.o
 
 snd-cs4231-lib-objs := cs4231_lib.o
@@ -29,18 +26,3 @@ obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-cs4231-lib.o
 obj-$(CONFIG_SND_WAVEFRONT) += snd-cs4231-lib.o
 
 include $(TOPDIR)/Rules.make
-
-snd-cs4231-lib.o: $(snd-cs4231-lib-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-cs4231-lib-objs)
-
-snd-cs4236-lib.o: $(snd-cs4236-lib-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-cs4236-lib-objs)
-
-snd-cs4231.o: $(snd-cs4231-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-cs4231-objs)
-
-snd-cs4232.o: $(snd-cs4232-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-cs4232-objs)
-
-snd-cs4236.o: $(snd-cs4236-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-cs4236-objs)

diff --git a/sound/isa/es1688/Makefile b/sound/isa/es1688/Makefile
index 6e25bed8832651dc22c31709b040245a8024fb62..3cef9094b7d06d4b0c76468617cc1dbb630c2e54 100644 (file)
--- a/sound/isa/es1688/Makefile
+++ b/sound/isa/es1688/Makefile
@@ -5,8 +5,6 @@
 
 O_TARGET     := _es1688.o
 
-list-multi   := snd-es1688-lib.o snd-es1688.o
-
 export-objs  := es1688_lib.o
 
 snd-es1688-lib-objs := es1688_lib.o
@@ -17,9 +15,3 @@ obj-$(CONFIG_SND_ES1688) += snd-es1688.o snd-es1688-lib.o
 obj-$(CONFIG_SND_GUSEXTREME) += snd-es1688-lib.o
 
 include $(TOPDIR)/Rules.make
-
-snd-es1688-lib.o: $(snd-es1688-lib-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-es1688-lib-objs)
-
-snd-es1688.o: $(snd-es1688-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-es1688-objs)

diff --git a/sound/isa/gus/Makefile b/sound/isa/gus/Makefile
index 21dc11ec05497e8dadad60dcb1a780612edc94c8..c76959f7407f5923489bf985bda64b0353a9b91a 100644 (file)
--- a/sound/isa/gus/Makefile
+++ b/sound/isa/gus/Makefile
@@ -5,9 +5,6 @@
 
 O_TARGET     := _gus.o
 
-list-multi   := snd-gus-lib.o snd-gusclassic.o snd-gusextreme.o \
-               snd-gusmax.o snd-interwave.o snd-interwave-stb.o
-
 export-objs  := gus_main.o gus_volume.o
 
 snd-gus-lib-objs := gus_main.o \
@@ -39,24 +36,3 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
 endif
 
 include $(TOPDIR)/Rules.make
-
-snd-gus-lib.o: $(snd-gus-lib-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-gus-lib-objs)
-
-snd-gus-synth.o: $(snd-gus-synth-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-gus-synth-objs)
-
-snd-gusclassic.o: $(snd-gusclassic-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-gusclassic-objs)
-
-snd-gusextreme.o: $(snd-gusextreme-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-gusextreme-objs)
-
-snd-gusmax.o: $(snd-gusmax-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-gusmax-objs)
-
-snd-interwave.o: $(snd-interwave-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-interwave-objs)
-
-snd-interwave-stb.o: $(snd-interwave-stb-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-interwave-stb-objs)

diff --git a/sound/isa/opti9xx/Makefile b/sound/isa/opti9xx/Makefile
index d1637150f80571927928e562447aed0ae005aa62..68b86cb444e2f3e517bcdfa9b07f6058f6289416 100644 (file)
--- a/sound/isa/opti9xx/Makefile
+++ b/sound/isa/opti9xx/Makefile
@@ -5,8 +5,6 @@
 
 O_TARGET     := _opti9xx.o
 
-list-multi   := snd-opti92x-ad1848.o snd-opti92x-cs4231.o snd-opti93x.o
-
 snd-opti92x-ad1848-objs := opti92x-ad1848.o
 snd-opti92x-cs4231-objs := opti92x-cs4231.o
 snd-opti93x-objs := opti93x.o
@@ -17,12 +15,3 @@ obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-opti92x-cs4231.o
 obj-$(CONFIG_SND_OPTI93X) += snd-opti93x.o
 
 include $(TOPDIR)/Rules.make
-
-snd-opti92x-ad1848.o: $(snd-opti92x-ad1848-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-opti92x-ad1848-objs)
-
-snd-opti92x-cs4231.o: $(snd-opti92x-cs4231-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-opti92x-cs4231-objs)
-
-snd-opti93x.o: $(snd-opti93x-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-opti93x-objs)

diff --git a/sound/isa/sb/Makefile b/sound/isa/sb/Makefile
index 37b6d10fe07d8458bd6ffff371e4fe72d1bef5a2..ea8fd19b612b3585eba39734bed7952d49e636a4 100644 (file)
--- a/sound/isa/sb/Makefile
+++ b/sound/isa/sb/Makefile
@@ -5,9 +5,6 @@
 
 O_TARGET     := _sb.o
 
-list-multi   := snd-sb-common.o snd-sb8-dsp.o snd-sb16-dsp.o snd-sb16-csp.o \
-               snd-sb8.o snd-sb16.o snd-sbawe.o snd-emu8000-synth.o snd-es968.o
-
 export-objs  := emu8000.o emu8000_synth.o sb_common.o sb8_main.o sb16_main.o sb16_csp.o
 
 snd-sb-common-objs := sb_common.o sb_mixer.o
@@ -38,30 +35,3 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
 endif
 
 include $(TOPDIR)/Rules.make
-
-snd-sb-common.o: $(snd-sb-common-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-sb-common-objs)
-
-snd-sb8-dsp.o: $(snd-sb8-dsp-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-sb8-dsp-objs)
-
-snd-sb16-dsp.o: $(snd-sb16-dsp-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-sb16-dsp-objs)
-
-snd-sb16-csp.o: $(snd-sb16-csp-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-sb16-csp-objs)
-
-snd-sb8.o: $(snd-sb8-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-sb8-objs)
-
-snd-sb16.o: $(snd-sb16-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-sb16-objs)
-
-snd-sbawe.o: $(snd-sbawe-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-sbawe-objs)
-
-snd-emu8000-synth.o: $(snd-emu8000-synth-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-emu8000-synth-objs)
-
-snd-es968.o: $(snd-es968-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-es968-objs)

diff --git a/sound/isa/wavefront/Makefile b/sound/isa/wavefront/Makefile
index 633ca2ee5127c10964d59e5d3c98658b369c892a..bd937c9152d686ba252a8b509e6e5854acd53a07 100644 (file)
--- a/sound/isa/wavefront/Makefile
+++ b/sound/isa/wavefront/Makefile
@@ -5,14 +5,9 @@
 
 O_TARGET     := _wavefront.o
 
-list-multi   := snd-wavefront.o
-
 snd-wavefront-objs := wavefront.o wavefront_fx.o wavefront_synth.o wavefront_midi.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_WAVEFRONT) += snd-wavefront.o
 
 include $(TOPDIR)/Rules.make
-
-snd-wavefront.o: $(snd-wavefront-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-wavefront-objs)

diff --git a/sound/oss/Makefile b/sound/oss/Makefile
index 62471a1aa61091ed5059d660a71e5809080bf986..5727b06622856962ecdd16443edce8ae5ed522ad 100644 (file)
--- a/sound/oss/Makefile
+++ b/sound/oss/Makefile
@@ -97,9 +97,6 @@ endif
 
 # Declare multi-part drivers.
 
-list-multi     := sound.o gus.o pas2.o sb.o sb_lib.o vidc_mod.o \
-    wavefront.o
-
 sound-objs     :=                                                      \
     dev_table.o soundcard.o sound_syms.o               \
     audio.o audio_syms.o dmabuf.o                                      \
@@ -118,31 +115,6 @@ O_TARGET   := sounddrivers.o
 
 include $(TOPDIR)/Rules.make
 
-
-
-# Link rules for multi-part drivers.
-
-sound.o: $(sound-objs)
-       $(LD) -r -o $@ $(sound-objs)
-
-gus.o: $(gus-objs)
-       $(LD) -r -o $@ $(gus-objs)
-
-pas2.o: $(pas2-objs)
-       $(LD) -r -o $@ $(pas2-objs)
-
-sb.o: $(sb-objs)
-       $(LD) -r -o $@ $(sb-objs)
-
-sb_lib.o: $(sb_lib-objs)
-       $(LD) -r -o $@ $(sb_lib-objs)
-
-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
 #
 # The translated files are protected by a file that keeps track

diff --git a/sound/pci/Makefile b/sound/pci/Makefile
index c629e4d69d3f74304985ec3b2e06fe83c68084da..c3dfbda7ec25d3e77f9dc77da88ad75caae79844 100644 (file)
--- a/sound/pci/Makefile
+++ b/sound/pci/Makefile
@@ -8,11 +8,6 @@ O_TARGET     := pci.o
 subdir-y     := ac97 ali5451 cs46xx emu10k1 korg1212 nm256 rme9652 trident ymfpci
 subdir-m     := $(subdir-y)
 
-list-multi   := snd-als4000.o snd-cmipci.o snd-cs4281.o snd-ens1370.o \
-               snd-ens1371.o snd-es1938.o snd-es1968.o snd-fm801.o \
-               snd-ice1712.o snd-intel8x0.o snd-maestro3.o snd-rme96.o \
-               snd-sonicvibes.o snd-via686.o snd-via8233.o
-
 snd-als4000-objs := als4000.o
 snd-cmipci-objs := cmipci.o
 snd-cs4281-objs := cs4281.o
@@ -47,48 +42,3 @@ obj-$(CONFIG_SND_VIA686) += snd-via686.o
 obj-$(CONFIG_SND_VIA8233) += snd-via8233.o
 
 include $(TOPDIR)/Rules.make
-
-snd-als4000.o: $(snd-als4000-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-als4000-objs)
-
-snd-cmipci.o: $(snd-cmipci-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-cmipci-objs)
-
-snd-cs4281.o: $(snd-cs4281-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-cs4281-objs)
-
-snd-ens1370.o: $(snd-ens1370-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-ens1370-objs)
-
-snd-ens1371.o: $(snd-ens1371-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-ens1371-objs)
-
-snd-es1938.o: $(snd-es1938-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-es1938-objs)
-
-snd-es1968.o: $(snd-es1968-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-es1968-objs)
-
-snd-fm801.o: $(snd-fm801-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-fm801-objs)
-
-snd-ice1712.o: $(snd-ice1712-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-ice1712-objs)
-
-snd-intel8x0.o: $(snd-intel8x0-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-intel8x0-objs)
-
-snd-maestro3.o: $(snd-maestro3-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-maestro3-objs)
-
-snd-rme96.o: $(snd-rme96-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-rme96-objs)
-
-snd-sonicvibes.o: $(snd-sonicvibes-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-sonicvibes-objs)
-
-snd-via686.o: $(snd-via686-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-via686-objs)
-
-snd-via8233.o: $(snd-via8233-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-via8233-objs)

diff --git a/sound/pci/ac97/Makefile b/sound/pci/ac97/Makefile
index 313fd35a4009546f5c00884e13f39cda09aa419e..869dbf17d0572bbe7199adf4d167c5e9d4891f01 100644 (file)
--- a/sound/pci/ac97/Makefile
+++ b/sound/pci/ac97/Makefile
@@ -5,8 +5,6 @@
 
 O_TARGET     := _ac97.o
 
-list-multi   := snd-ac97-codec.o snd-ak4531-codec.o
-
 export-objs  := ac97_codec.o ak4531_codec.o
 
 snd-ac97-codec-objs := ac97_codec.o
@@ -31,9 +29,3 @@ obj-$(CONFIG_SND_TRIDENT) += snd-ac97-codec.o
 obj-$(CONFIG_SND_YMFPCI) += snd-ac97-codec.o
 
 include $(TOPDIR)/Rules.make
-
-snd-ac97-codec.o: $(snd-ac97-codec-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-ac97-codec-objs)
-
-snd-ak4531-codec.o: $(snd-ak4531-codec-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-ak4531-codec-objs)

diff --git a/sound/pci/ali5451/Makefile b/sound/pci/ali5451/Makefile
index 0327116051a3c9cd7d3f9ade792c0fa7c95715dd..ee2672defad5274ffb1d59520651dbc65c9eda44 100644 (file)
--- a/sound/pci/ali5451/Makefile
+++ b/sound/pci/ali5451/Makefile
@@ -5,14 +5,9 @@
 
 O_TARGET     := _ali5451.o
 
-list-multi   := snd-ali5451.o
-
 snd-ali5451-objs := ali5451.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_ALI5451) += snd-ali5451.o
 
 include $(TOPDIR)/Rules.make
-
-snd-ali5451.o: $(snd-ali5451-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-ali5451-objs)

diff --git a/sound/pci/cs46xx/Makefile b/sound/pci/cs46xx/Makefile
index 3d8fccac64d01abb33b2a8e316c2128f4c08c94f..8dbafbdde2f173d013a2da7f9f937fe4b1980d6d 100644 (file)
--- a/sound/pci/cs46xx/Makefile
+++ b/sound/pci/cs46xx/Makefile
@@ -5,14 +5,9 @@
 
 O_TARGET     := _cs46xx.o
 
-list-multi   := snd-cs46xx.o
-
 snd-cs46xx-objs := cs46xx.o cs46xx_lib.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_CS46XX) += snd-cs46xx.o
 
 include $(TOPDIR)/Rules.make
-
-snd-cs46xx.o: $(snd-cs46xx-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-cs46xx-objs)

diff --git a/sound/pci/emu10k1/Makefile b/sound/pci/emu10k1/Makefile
index 854541e5e73a7a251f3d9a93eed828ba4ab68a50..c8fdba031c10c1143b1e8e01c9865332b8e12320 100644 (file)
--- a/sound/pci/emu10k1/Makefile
+++ b/sound/pci/emu10k1/Makefile
@@ -5,8 +5,6 @@
 
 O_TARGET     := _emu10k1.o
 
-list-multi   := snd-emu10k1.o snd-emu10k1-synth.o
-
 export-objs  := emu10k1_main.o
 
 snd-emu10k1-objs := emu10k1.o emu10k1_main.o \
@@ -21,9 +19,3 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
 endif
 
 include $(TOPDIR)/Rules.make
-
-snd-emu10k1.o: $(snd-emu10k1-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-emu10k1-objs)
-
-snd-emu10k1-synth.o: $(snd-emu10k1-synth-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-emu10k1-synth-objs)

diff --git a/sound/pci/korg1212/Makefile b/sound/pci/korg1212/Makefile
index 0c88d1a85d57ad4ba07c971b2f049f1973434e93..3b3970119d99f71daabd9eaa62b0de44b6fbdd06 100644 (file)
--- a/sound/pci/korg1212/Makefile
+++ b/sound/pci/korg1212/Makefile
@@ -5,14 +5,9 @@
 
 O_TARGET     := _korg1212.o
 
-list-multi   := snd-korg1212.o
-
 snd-korg1212-objs := korg1212.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_KORG1212) += snd-korg1212.o
 
 include $(TOPDIR)/Rules.make
-
-snd-korg1212.o: $(snd-korg1212-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-korg1212-objs)

diff --git a/sound/pci/nm256/Makefile b/sound/pci/nm256/Makefile
index 3a11dced5211ed6be29ccf9c696d2f8013dec247..117e421072b1ffd071483cb32222f2a705e14266 100644 (file)
--- a/sound/pci/nm256/Makefile
+++ b/sound/pci/nm256/Makefile
@@ -5,14 +5,9 @@
 
 O_TARGET     := _nm256.o
 
-list-multi   := snd-nm256.o
-
 snd-nm256-objs := nm256.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_NM256) += snd-nm256.o
 
 include $(TOPDIR)/Rules.make
-
-snd-nm256.o: $(snd-nm256-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-nm256-objs)

diff --git a/sound/pci/rme9652/Makefile b/sound/pci/rme9652/Makefile
index ccea0d109493e5e18d5524f1fbaf36a570df6015..af34d8ef4fc228be463be5483c827af5b902969f 100644 (file)
--- a/sound/pci/rme9652/Makefile
+++ b/sound/pci/rme9652/Makefile
@@ -5,8 +5,6 @@
 
 O_TARGET     := _rme9652.o
 
-list-multi   := snd-rme9652-mem.o snd-rme9652.o
-
 export-objs  := rme9652_mem.o
 
 snd-rme9652-mem-objs := rme9652_mem.o
@@ -16,9 +14,3 @@ snd-rme9652-objs := rme9652.o
 obj-$(CONFIG_SND_RME9652) += snd-rme9652.o snd-rme9652-mem.o
 
 include $(TOPDIR)/Rules.make
-
-snd-rme9652-mem.o: $(snd-rme9652-mem-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-rme9652-mem-objs)
-
-snd-rme9652.o: $(snd-rme9652-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-rme9652-objs)

diff --git a/sound/pci/trident/Makefile b/sound/pci/trident/Makefile
index 6bcfaa83e24218bef62228ebd857f76ef41f6332..ed8ae57c9f6133d3ad5ec410d518fba5aed1f335 100644 (file)
--- a/sound/pci/trident/Makefile
+++ b/sound/pci/trident/Makefile
@@ -5,8 +5,6 @@
 
 O_TARGET     := _trident.o
 
-list-multi   := snd-trident.o snd-trident-synth.o
-
 export-objs  := trident_main.o
 
 snd-trident-objs := trident.o trident_main.o trident_memory.o
@@ -19,9 +17,3 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
 endif
 
 include $(TOPDIR)/Rules.make
-
-snd-trident.o: $(snd-trident-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-trident-objs)
-
-snd-trident-synth.o: $(snd-trident-synth-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-trident-synth-objs)

diff --git a/sound/pci/ymfpci/Makefile b/sound/pci/ymfpci/Makefile
index ba9bc426dcd34a90fc166e7342072a597ad4c569..de3410baac7e442ae6d22e01edf901ec6490f63c 100644 (file)
--- a/sound/pci/ymfpci/Makefile
+++ b/sound/pci/ymfpci/Makefile
@@ -5,14 +5,9 @@
 
 O_TARGET     := _ymfpci.o
 
-list-multi   := snd-ymfpci.o
-
 snd-ymfpci-objs := ymfpci.o ymfpci_main.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_YMFPCI) += snd-ymfpci.o
 
 include $(TOPDIR)/Rules.make
-
-snd-ymfpci.o: $(snd-ymfpci-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-ymfpci-objs)

diff --git a/sound/ppc/Makefile b/sound/ppc/Makefile
index ffb491416ee595694d7f6470434d59818be69b68..a5226d8ba62ebb2946bfeb0051e3e00021fe1070 100644 (file)
--- a/sound/ppc/Makefile
+++ b/sound/ppc/Makefile
@@ -5,14 +5,9 @@
 
 O_TARGET     := ppc.o
 
-list-multi   := snd-powermac.o
-
 snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_POWERMAC) += snd-powermac.o
 
 include $(TOPDIR)/Rules.make
-
-snd-powermac.o: $(snd-powermac-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-powermac-objs)

diff --git a/sound/synth/Makefile b/sound/synth/Makefile
index 7bcf311f089dc3f896e9e3f88b09031b50422a71..63242d3d15111cfd2bf248401584614efc9df2a2 100644 (file)
--- a/sound/synth/Makefile
+++ b/sound/synth/Makefile
@@ -8,8 +8,6 @@ O_TARGET     := synth.o
 subdir-y     := emux
 subdir-m     := $(subdir-y)
 
-list-multi   := snd-util-mem.o
-
 export-objs  := util_mem.o
 
 snd-util-mem-objs := util_mem.o
@@ -22,6 +20,3 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
 endif
 
 include $(TOPDIR)/Rules.make
-
-snd-util-mem.o: $(snd-util-mem-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-util-mem-objs)

diff --git a/sound/synth/emux/Makefile b/sound/synth/emux/Makefile
index b8ed7d2b0186f0488bc8c4a174ff302d7b7fd636..afcf961a32fedb2ba34e4871d2264dc85f210859 100644 (file)
--- a/sound/synth/emux/Makefile
+++ b/sound/synth/emux/Makefile
@@ -5,8 +5,6 @@
 
 O_TARGET     := _emux.o
 
-list-multi   := snd-emux-synth.o
-
 export-objs  := emux.o
 
 snd-emux-synth-objs := emux.o emux_synth.o emux_seq.o emux_nrpn.o \
@@ -19,6 +17,3 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
 endif
 
 include $(TOPDIR)/Rules.make
-
-snd-emux-synth.o: $(snd-emux-synth-objs)
-       $(LD) $(LD_RFLAG) -r -o $@ $(snd-emux-synth-objs)