Commit b6e9d517 authored by Kai Germaschewski's avatar Kai Germaschewski

kbuild: Clean up sound/*/Makefile

parent 46c42661
...@@ -8,25 +8,13 @@ export-objs := sound_core.o ...@@ -8,25 +8,13 @@ export-objs := sound_core.o
mod-subdirs := oss core i2c drivers isa pci ppc synth mod-subdirs := oss core i2c drivers isa pci ppc synth
obj-$(CONFIG_SOUND) += soundcore.o obj-$(CONFIG_SOUND) += soundcore.o
obj-$(CONFIG_SOUND_PRIME) += oss/
obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/
subdir-$(CONFIG_SOUND_PRIME) += oss
ifeq ($(CONFIG_SOUND_PRIME),y)
obj-y += oss/_oss.o
endif
subdir-$(CONFIG_SND) += core i2c drivers isa pci ppc arm synth
ifeq ($(CONFIG_SND),y) ifeq ($(CONFIG_SND),y)
obj-y += core/_core.o i2c/_i2c.o
obj-y += drivers/_drivers.o
obj-y += isa/_isa.o
obj-y += pci/_pci.o
obj-y += arm/_arm.o
obj-y += ppc/_ppc.o
obj-y += synth/_synth.o
obj-y += last.o obj-y += last.o
endif endif
soundcore-objs := sound_core.o sound_firmware.o soundcore-objs := sound_core.o sound_firmware.o
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
# Makefile for ALSA # Makefile for ALSA
# #
O_TARGET := _arm.o
snd-sa11xx-uda1341-objs := sa11xx-uda1341.o snd-sa11xx-uda1341-objs := sa11xx-uda1341.o
# Toplevel Module Dependency # Toplevel Module Dependency
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 1999,2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 1999,2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _core.o
export-objs := sound.o pcm.o pcm_lib.o rawmidi.o timer.o rtctimer.o hwdep.o export-objs := sound.o pcm.o pcm_lib.o rawmidi.o timer.o rtctimer.o hwdep.o
mod-subdirs := oss seq mod-subdirs := oss seq
...@@ -29,26 +27,10 @@ ifeq ($(subst m,y,$(CONFIG_RTC)),y) ...@@ -29,26 +27,10 @@ ifeq ($(subst m,y,$(CONFIG_RTC)),y)
obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o
endif endif
obj-$(CONFIG_SND_HWDEP) += snd-hwdep.o obj-$(CONFIG_SND_HWDEP) += snd-hwdep.o
obj-$(CONFIG_SND_MIXER_OSS) += oss/
subdir-$(CONFIG_SND_MIXER_OSS) += oss obj-$(CONFIG_SND_PCM_OSS) += snd-pcm.o snd-timer.o oss/
subdir-$(CONFIG_SND_PCM_OSS) += oss obj-$(CONFIG_SND_SEQUENCER) += snd-timer.o seq/
ifeq ($(filter $(subdir-y),oss),oss) obj-$(CONFIG_SND_BIT32_EMUL) += ioctl32/
obj-y += oss/_oss.o
endif
obj-$(CONFIG_SND_PCM_OSS) += snd-pcm.o snd-timer.o
subdir-$(CONFIG_SND_SEQUENCER) += seq
ifeq ($(CONFIG_SND_SEQUENCER),y)
obj-y += seq/_seq.o
endif
obj-$(CONFIG_SND_SEQUENCER) += snd-timer.o
subdir-$(CONFIG_SND_BIT32_EMUL) += ioctl32
ifeq ($(CONFIG_SND_BIT32_EMUL),y)
obj-y += ioctl32/_ioctl32.o
endif
# Toplevel Module Dependency # Toplevel Module Dependency
obj-$(CONFIG_SND_DUMMY) += snd-pcm.o snd-timer.o snd.o obj-$(CONFIG_SND_DUMMY) += snd-pcm.o snd-timer.o snd.o
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _ioctl32.o
snd-ioctl32-objs := ioctl32.o pcm32.o rawmidi32.o timer32.o hwdep32.o snd-ioctl32-objs := ioctl32.o pcm32.o rawmidi32.o timer32.o hwdep32.o
ifeq ($(CONFIG_SND_SEQUENCER),y) ifeq ($(CONFIG_SND_SEQUENCER),y)
snd-ioctl32-objs += seq32.o snd-ioctl32-objs += seq32.o
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _oss.o
export-objs := mixer_oss.o export-objs := mixer_oss.o
snd-mixer-oss-objs := mixer_oss.o snd-mixer-oss-objs := mixer_oss.o
......
...@@ -3,19 +3,10 @@ ...@@ -3,19 +3,10 @@
# Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _seq.o
mod-subdirs := instr mod-subdirs := instr
subdir-$(CONFIG_SND) += instr obj-$(CONFIG_SND) += instr/
ifeq ($(CONFIG_SND),y) obj-$(CONFIG_SND_SEQUENCER_OSS) += oss/
obj-y += instr/_instr.o
endif
subdir-$(CONFIG_SND_SEQUENCER_OSS) += oss
ifeq ($(CONFIG_SND_SEQUENCER_OSS),y)
obj-y += oss/_oss.o
endif
export-objs := seq_device.o seq.o seq_ports.o seq_instr.o seq_midi_emul.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 seq_midi_event.o seq_virmidi.o
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _instr.o
export-objs := ainstr_fm.o ainstr_simple.o ainstr_gf1.o ainstr_iw.o export-objs := ainstr_fm.o ainstr_simple.o ainstr_gf1.o ainstr_iw.o
snd-ainstr-fm-objs := ainstr_fm.o snd-ainstr-fm-objs := ainstr_fm.o
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _oss.o
snd-seq-oss-objs := seq_oss.o seq_oss_init.o seq_oss_timer.o seq_oss_ioctl.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_event.o seq_oss_rw.o seq_oss_synth.o \
seq_oss_midi.o seq_oss_readq.o seq_oss_writeq.o seq_oss_midi.o seq_oss_readq.o seq_oss_writeq.o
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _drivers.o
mod-subdirs := opl3 mpu401 mod-subdirs := opl3 mpu401
snd-dummy-objs := dummy.o snd-dummy-objs := dummy.o
...@@ -18,9 +16,6 @@ obj-$(CONFIG_SND_VIRMIDI) += snd-virmidi.o ...@@ -18,9 +16,6 @@ obj-$(CONFIG_SND_VIRMIDI) += snd-virmidi.o
obj-$(CONFIG_SND_SERIAL_U16550) += snd-serial-u16550.o obj-$(CONFIG_SND_SERIAL_U16550) += snd-serial-u16550.o
obj-$(CONFIG_SND_MTPAV) += snd-mtpav.o obj-$(CONFIG_SND_MTPAV) += snd-mtpav.o
subdir-$(CONFIG_SND) += opl3 mpu401 obj-$(CONFIG_SND) += opl3/ mpu401/
ifeq ($(CONFIG_SND),y)
obj-y += mpu401/_mpu401.o opl3/_opl3.o
endif
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _mpu401.o
export-objs := mpu401_uart.o export-objs := mpu401_uart.o
snd-mpu401-objs := mpu401.o snd-mpu401-objs := mpu401.o
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _opl3.o
export-objs := opl3_lib.o export-objs := opl3_lib.o
snd-opl3-lib-objs := opl3_lib.o opl3_synth.o snd-opl3-lib-objs := opl3_lib.o opl3_synth.o
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _i2c.o mod-subdirs := l3
export-objs := i2c.o cs8427.o tea6330t.o export-objs := i2c.o cs8427.o tea6330t.o
...@@ -11,13 +11,7 @@ snd-i2c-objs := i2c.o ...@@ -11,13 +11,7 @@ snd-i2c-objs := i2c.o
snd-cs8427-objs := cs8427.o snd-cs8427-objs := cs8427.o
snd-tea6330t-objs := tea6330t.o snd-tea6330t-objs := tea6330t.o
ifeq ($(subst m,y,$(CONFIG_L3)),y) obj-$(CONFIG_SND) += l3/
subdir-$(CONFIG_L3) += l3
endif
ifeq ($(filter $(subdir-y),l3),l3)
subdir-m := l3
obj-y += l3/l3.o
endif
# Toplevel Module Dependency # Toplevel Module Dependency
obj-$(CONFIG_SND_INTERWAVE_STB) += snd-tea6330t.o snd-i2c.o obj-$(CONFIG_SND_INTERWAVE_STB) += snd-tea6330t.o snd-i2c.o
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
# Makefile for ALSA # Makefile for ALSA
# #
O_TARGET = l3.o
export-objs += uda1341.o export-objs += uda1341.o
snd-uda1341-objs := uda1341.o snd-uda1341-objs := uda1341.o
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _isa.o
mod-subdirs := ad1816a ad1848 cs423x es1688 gus opti9xx sb wavefront mod-subdirs := ad1816a ad1848 cs423x es1688 gus opti9xx sb wavefront
snd-als100-objs := als100.o snd-als100-objs := als100.o
...@@ -24,16 +22,7 @@ obj-$(CONFIG_SND_ES18XX) += snd-es18xx.o ...@@ -24,16 +22,7 @@ obj-$(CONFIG_SND_ES18XX) += snd-es18xx.o
obj-$(CONFIG_SND_OPL3SA2) += snd-opl3sa2.o obj-$(CONFIG_SND_OPL3SA2) += snd-opl3sa2.o
obj-$(CONFIG_SND_SGALAXY) += snd-sgalaxy.o obj-$(CONFIG_SND_SGALAXY) += snd-sgalaxy.o
subdir-$(CONFIG_SND) += ad1816a ad1848 cs423x es1688 gus opti9xx sb wavefront obj-$(CONFIG_SND) += ad1816a/ ad1848/ cs423x/ es1688/ gus/ opti9xx/ \
ifeq ($(CONFIG_SND),y) sb/ wavefront/
obj-y += ad1816a/_ad1816a.o \
ad1848/_ad1848.o \
cs423x/_cs423x.o \
es1688/_es1688.o \
gus/_gus.o \
opti9xx/_opti9xx.o \
sb/_sb.o \
wavefront/_wavefront.o
endif
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _ad1816a.o
export-objs := ad1816a_lib.o export-objs := ad1816a_lib.o
snd-ad1816a-lib-objs := ad1816a_lib.o snd-ad1816a-lib-objs := ad1816a_lib.o
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _ad1848.o
export-objs := ad1848_lib.o export-objs := ad1848_lib.o
snd-ad1848-lib-objs := ad1848_lib.o snd-ad1848-lib-objs := ad1848_lib.o
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _cs423x.o
export-objs := cs4231_lib.o cs4236_lib.o export-objs := cs4231_lib.o cs4236_lib.o
snd-cs4231-lib-objs := cs4231_lib.o snd-cs4231-lib-objs := cs4231_lib.o
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _es1688.o
export-objs := es1688_lib.o export-objs := es1688_lib.o
snd-es1688-lib-objs := es1688_lib.o snd-es1688-lib-objs := es1688_lib.o
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _gus.o
export-objs := gus_main.o gus_volume.o export-objs := gus_main.o gus_volume.o
snd-gus-lib-objs := gus_main.o \ snd-gus-lib-objs := gus_main.o \
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _opti9xx.o
snd-opti92x-ad1848-objs := opti92x-ad1848.o snd-opti92x-ad1848-objs := opti92x-ad1848.o
snd-opti92x-cs4231-objs := opti92x-cs4231.o snd-opti92x-cs4231-objs := opti92x-cs4231.o
snd-opti93x-objs := opti93x.o snd-opti93x-objs := opti93x.o
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _sb.o
export-objs := emu8000.o emu8000_synth.o sb_common.o sb8_main.o sb16_main.o sb16_csp.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 snd-sb-common-objs := sb_common.o sb_mixer.o
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _wavefront.o
snd-wavefront-objs := wavefront.o wavefront_fx.o wavefront_synth.o wavefront_midi.o snd-wavefront-objs := wavefront.o wavefront_fx.o wavefront_synth.o wavefront_midi.o
# Toplevel Module Dependency # Toplevel Module Dependency
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# 18 Apr 1998, Michael Elizabeth Chastain, <mailto:mec@shout.net> # 18 Apr 1998, Michael Elizabeth Chastain, <mailto:mec@shout.net>
# Rewritten to use lists instead of if-statements. # Rewritten to use lists instead of if-statements.
O_TARGET := _oss.o
# All of the (potential) objects that export symbols. # All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'. # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
...@@ -78,23 +76,9 @@ ifeq ($(CONFIG_MIDI_EMU10K1),y) ...@@ -78,23 +76,9 @@ ifeq ($(CONFIG_MIDI_EMU10K1),y)
obj-$(CONFIG_SOUND_EMU10K1) += sound.o obj-$(CONFIG_SOUND_EMU10K1) += sound.o
endif endif
subdir-$(CONFIG_SOUND_EMU10K1) += emu10k1 obj-$(CONFIG_SOUND_EMU10K1) += emu10k1/
subdir-$(CONFIG_SOUND_CS4281) += cs4281 obj-$(CONFIG_SOUND_CS4281) += cs4281/
obj-$(CONFIG_DMASOUND) += dmasound/
ifeq ($(CONFIG_SOUND_EMU10K1),y)
obj-y += emu10k1/_emu10k1.o
endif
ifeq ($(CONFIG_SOUND_CS4281),y)
obj-y += cs4281/_cs4281.o
endif
subdir-$(CONFIG_DMASOUND) += dmasound
ifeq ($(CONFIG_DMASOUND),y)
obj-y += dmasound/_dmasound.o
endif
# Declare multi-part drivers. # Declare multi-part drivers.
......
# Makefile for Cirrus Logic-Crystal CS4281 # Makefile for Cirrus Logic-Crystal CS4281
# #
O_TARGET := _cs4281.o
obj-$(CONFIG_SOUND_CS4281) += cs4281.o obj-$(CONFIG_SOUND_CS4281) += cs4281.o
cs4281-objs += cs4281m.o cs4281-objs += cs4281m.o
......
# #
# Makefile for the DMA sound driver # Makefile for the DMA sound driver
# #
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET = _dmasound.o
export-objs := dmasound_core.o export-objs := dmasound_core.o
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
# #
# 12 Apr 2000 Rui Sousa # 12 Apr 2000 Rui Sousa
O_TARGET := _emu10k1.o
obj-$(CONFIG_SOUND_EMU10K1) += emu10k1.o obj-$(CONFIG_SOUND_EMU10K1) += emu10k1.o
emu10k1-objs := audio.o cardmi.o cardmo.o cardwi.o cardwo.o ecard.o \ emu10k1-objs := audio.o cardmi.o cardmo.o cardwi.o cardwo.o ecard.o \
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _pci.o
mod-subdirs := ac97 ali5451 cs46xx emu10k1 korg1212 nm256 rme9652 trident ymfpci mod-subdirs := ac97 ali5451 cs46xx emu10k1 korg1212 nm256 rme9652 trident ymfpci
snd-als4000-objs := als4000.o snd-als4000-objs := als4000.o
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _ppc.o
snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o
# Toplevel Module Dependency # Toplevel Module Dependency
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _synth.o
mod-subdirs := emux mod-subdirs := emux
export-objs := util_mem.o export-objs := util_mem.o
...@@ -18,9 +16,6 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y) ...@@ -18,9 +16,6 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
obj-$(CONFIG_SND_SBAWE) += snd-util-mem.o obj-$(CONFIG_SND_SBAWE) += snd-util-mem.o
endif endif
subdir-$(CONFIG_SND) += emux obj-$(CONFIG_SND) += emux/
ifeq ($(CONFIG_SND),y)
obj-y += emux/_emux.o
endif
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
# #
O_TARGET := _emux.o
export-objs := emux.o export-objs := emux.o
snd-emux-synth-objs := emux.o emux_synth.o emux_seq.o emux_nrpn.o \ snd-emux-synth-objs := emux.o emux_synth.o emux_seq.o emux_nrpn.o \
......
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