Skip to content

L
linux
Commit 7ae1fc3a authored by Kai Germaschewski's avatar Kai Germaschewski
Browse files
Options

Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linus-2.5.vm 

into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make
parents c643de42 240326d5
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 446 deletions
drivers/isdn/tpam/Makefile
View file @ 7ae1fc3a
......@@ -6,7 +6,6 @@ O_TARGET := vmlinux-obj.o
# Multipart objects.
list-multi := tpam.o
tpam-objs := tpam_main.o tpam_nco.o tpam_memory.o tpam_commands.o tpam_queues.o tpam_hdlc.o tpam_crcpc.o
# Each configuration option enables a list of files.
......@@ -14,8 +13,3 @@ tpam-objs := tpam_main.o tpam_nco.o tpam_memory.o tpam_commands.o tpam_queues.o
obj-$(CONFIG_ISDN_DRV_TPAM) += tpam.o
include $(TOPDIR)/Rules.make
# Link rules for multi-part drivers.
tpam.o: $(tpam-objs)
$(LD) -r -o $@ $(tpam-objs)
drivers/net/Makefile
View file @ 7ae1fc3a
......@@ -18,7 +18,6 @@ O_TARGET := net.o
export-objs := 8390.o arlan.o aironet4500_core.o aironet4500_card.o \
ppp_async.o ppp_generic.o slhc.o pppox.o auto_irq.o \
net_init.o mii.o
list-multi := rcpci.o
rcpci-objs := rcpci45.o rclanmtl.o
ifeq ($(CONFIG_E100),y)
......@@ -236,7 +235,3 @@ include $(TOPDIR)/Rules.make
clean:
rm -f core *.o *.a *.s
rcpci.o: $(rcpci-objs)
$(LD) -r -o $@ $(rcpci-objs)
drivers/net/tulip/Makefile
View file @ 7ae1fc3a
......@@ -23,14 +23,9 @@ obj-$(CONFIG_TULIP) += tulip.o
obj-$(CONFIG_DE4X5) += de4x5.o
# Declare multi-part drivers.
list-multi := tulip.o
tulip-objs := eeprom.o interrupt.o media.o \
timer.o tulip_core.o \
21142.o pnic.o pnic2.o
include $(TOPDIR)/Rules.make
# Link rules for multi-part drivers.
tulip.o: $(tulip-objs)
$(LD) -r -o $@ $(tulip-objs)
drivers/net/wan/Makefile
View file @ 7ae1fc3a
......@@ -5,28 +5,29 @@
# Rewritten to use lists instead of if-statements.
#
SUB_DIRS :=
O_TARGET := wan.o
export-objs = z85230.o syncppp.o comx.o sdladrv.o cycx_drv.o hdlc_generic.o
list-multi = wanpipe.o cyclomx.o
export-objs := z85230.o syncppp.o comx.o sdladrv.o cycx_drv.o hdlc_generic.o
wanpipe-objs = sdlamain.o sdla_ft1.o $(wanpipe-y)
wanpipe-y := sdlamain.o sdla_ft1.o
wanpipe-$(CONFIG_WANPIPE_X25) += sdla_x25.o
wanpipe-$(CONFIG_WANPIPE_FR) += sdla_fr.o
wanpipe-$(CONFIG_WANPIPE_CHDLC) += sdla_chdlc.o
wanpipe-$(CONFIG_WANPIPE_PPP) += sdla_ppp.o
wanpipe-$(CONFIG_WANPIPE_MULTPPP) += wanpipe_multppp.o
wanpipe-objs := $(wanpipe-y)
cyclomx-objs = cycx_main.o $(cyclomx-y)
cyclomx-y := cycx_main.o
cyclomx-$(CONFIG_CYCLOMX_X25) += cycx_x25.o
cyclomx-objs := $(cyclomx-y)
hdlc-y := hdlc_generic.o
hdlc-$(CONFIG_HDLC_RAW) += hdlc_raw.o
hdlc-$(CONFIG_HDLC_CISCO) += hdlc_cisco.o
hdlc-$(CONFIG_HDLC_FR) += hdlc_fr.o
hdlc-$(CONFIG_HDLC_PPP) += hdlc_ppp.o
hdlc-$(CONFIG_HDLC_X25) += hdlc_x25.o
hdlc-objs := $(hdlc-y)
obj-$(CONFIG_HOSTESS_SV11) += z85230.o syncppp.o hostess_sv11.o
obj-$(CONFIG_SEALEVEL_4021) += z85230.o syncppp.o sealevel.o
......@@ -69,13 +70,3 @@ obj-$(CONFIG_N2) += n2.o
obj-$(CONFIG_C101) += c101.o
include $(TOPDIR)/Rules.make
hdlc.o: hdlc_generic.o $(hdlc-y)
$(LD) -r -o $@ hdlc_generic.o $(hdlc-y)
wanpipe.o: $(wanpipe-objs)
$(LD) -r -o $@ $(wanpipe-objs)
cyclomx.o: $(cyclomx-objs)
$(LD) -r -o $@ $(cyclomx-objs)
sound/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/core/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/core/ioctl32/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/core/oss/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/core/seq/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/core/seq/instr/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/core/seq/oss/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/drivers/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/drivers/mpu401/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/drivers/opl3/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/i2c/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/isa/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/isa/ad1816a/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/isa/ad1848/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/isa/cs423x/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/isa/es1688/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/isa/gus/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/isa/opti9xx/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/isa/sb/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/isa/wavefront/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/oss/Makefile
View file @ 7ae1fc3a
......@@ -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
......
sound/pci/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/pci/ac97/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/pci/ali5451/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/pci/cs46xx/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/pci/emu10k1/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/pci/korg1212/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/pci/nm256/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/pci/rme9652/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/pci/trident/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/pci/ymfpci/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/ppc/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/synth/Makefile
View file @ 7ae1fc3a
......@@ -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)
sound/synth/emux/Makefile
View file @ 7ae1fc3a
......@@ -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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7