Commit 3b5ebe0a authored by Linus Torvalds's avatar Linus Torvalds

Merge http://linux-isdn.bkbits.net/linux-2.5.make-sound

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
parents 5cacfc4f 2ca2136a
......@@ -5,48 +5,24 @@ O_TARGET := sound.o
export-objs := sound_core.o
mod-subdirs := oss core i2c drivers isa pci ppc synth
obj-$(CONFIG_SOUND) += soundcore.o
subdir-$(CONFIG_SOUND_PRIME) += oss
ifeq ($(CONFIG_SOUND_PRIME),y)
subdir-m += oss
obj-y += oss/sounddrivers.o
obj-y += oss/_oss.o
endif
_subdirs := core i2c drivers isa pci ppc arm synth
subdir-$(CONFIG_SND) += $(_subdirs)
subdir-$(CONFIG_SND) += core i2c drivers isa pci ppc arm synth
ifeq ($(CONFIG_SND),y)
subdir-m += $(_subdirs)
obj-y += core/core.o i2c/_i2c.o
obj-y += drivers/drivers.o \
drivers/mpu401/_mpu401.o \
drivers/opl3/_opl3.o
obj-y += isa/isa.o \
isa/ad1816a/_ad1816a.o \
isa/ad1848/_ad1848.o \
isa/cs423x/_cs423x.o \
isa/es1688/_es1688.o \
isa/gus/_gus.o \
isa/opti9xx/_opti9xx.o \
isa/sb/_sb.o \
isa/wavefront/_wavefront.o
obj-y += pci/pci.o \
pci/ac97/_ac97.o \
pci/ali5451/_ali5451.o \
pci/cs46xx/_cs46xx.o \
pci/emu10k1/_emu10k1.o \
pci/korg1212/_korg1212.o \
pci/nm256/_nm256.o \
pci/rme9652/_rme9652.o \
pci/trident/_trident.o \
pci/ymfpci/_ymfpci.o
obj-y += ppc/ppc.o
obj-y += arm/arm.o
obj-y += synth/synth.o \
synth/emux/_emux.o
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
endif
......
......@@ -2,7 +2,7 @@
# Makefile for ALSA
#
O_TARGET := arm.o
O_TARGET := _arm.o
snd-sa11xx-uda1341-objs := sa11xx-uda1341.o
......
......@@ -3,10 +3,12 @@
# Copyright (c) 1999,2001 by Jaroslav Kysela <perex@suse.cz>
#
O_TARGET := core.o
O_TARGET := _core.o
export-objs := sound.o pcm.o pcm_lib.o rawmidi.o timer.o rtctimer.o hwdep.o
mod-subdirs := oss seq
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)
......@@ -31,16 +33,14 @@ obj-$(CONFIG_SND_HWDEP) += snd-hwdep.o
subdir-$(CONFIG_SND_MIXER_OSS) += oss
subdir-$(CONFIG_SND_PCM_OSS) += oss
ifeq ($(filter $(subdir-y),oss),oss)
subdir-m += oss
obj-y += oss/oss.o
obj-y += oss/_oss.o
endif
obj-$(CONFIG_SND_PCM_OSS) += snd-pcm.o
subdir-$(CONFIG_SND_SEQUENCER) += seq
ifeq ($(CONFIG_SND_SEQUENCER),y)
subdir-m += seq
obj-y += seq/sq.o
obj-y += seq/_seq.o
endif
obj-$(CONFIG_SND_SEQUENCER) += snd-timer.o
......
......@@ -3,7 +3,7 @@
# Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
#
O_TARGET := oss.o
O_TARGET := _oss.o
export-objs := mixer_oss.o
......
......@@ -3,14 +3,18 @@
# Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
#
O_TARGET := sq.o
O_TARGET := _seq.o
mod-subdirs := instr
subdir-$(CONFIG_SND) += instr
ifeq ($(CONFIG_SND),y)
obj-y += instr/_instr.o
endif
subdir-y := instr
subdir-m := $(subdir-y)
obj-y += instr/instr.o
subdir-$(CONFIG_SND_SEQUENCER_OSS) += oss
ifeq ($(CONFIG_SND_SEQUENCER_OSS),y)
obj-y += oss/oss.o
obj-y += oss/_oss.o
endif
export-objs := seq_device.o seq.o seq_ports.o seq_instr.o seq_midi_emul.o \
......
......@@ -3,7 +3,7 @@
# Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
#
O_TARGET := instr.o
O_TARGET := _instr.o
export-objs := ainstr_fm.o ainstr_simple.o ainstr_gf1.o ainstr_iw.o
......
......@@ -3,7 +3,7 @@
# Copyright (c) 1999 by Jaroslav Kysela <perex@suse.cz>
#
O_TARGET := oss.o
O_TARGET := _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 \
......
......@@ -3,10 +3,9 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
#
O_TARGET := drivers.o
O_TARGET := _drivers.o
subdir-y := opl3 mpu401
subdir-m := $(subdir-y)
mod-subdirs := opl3 mpu401
snd-dummy-objs := dummy.o
snd-mtpav-objs := mtpav.o
......@@ -19,4 +18,9 @@ obj-$(CONFIG_SND_VIRMIDI) += snd-virmidi.o
obj-$(CONFIG_SND_SERIAL_U16550) += snd-serial-u16550.o
obj-$(CONFIG_SND_MTPAV) += snd-mtpav.o
subdir-$(CONFIG_SND) += opl3 mpu401
ifeq ($(CONFIG_SND),y)
obj-y += mpu401/_mpu401.o opl3/_opl3.o
endif
include $(TOPDIR)/Rules.make
......@@ -3,10 +3,9 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
#
O_TARGET := isa.o
O_TARGET := _isa.o
subdir-y := ad1816a ad1848 cs423x es1688 gus opti9xx sb wavefront
subdir-m := $(subdir-y)
mod-subdirs := ad1816a ad1848 cs423x es1688 gus opti9xx sb wavefront
snd-als100-objs := als100.o
snd-azt2320-objs := azt2320.o
......@@ -25,4 +24,16 @@ obj-$(CONFIG_SND_ES18XX) += snd-es18xx.o
obj-$(CONFIG_SND_OPL3SA2) += snd-opl3sa2.o
obj-$(CONFIG_SND_SGALAXY) += snd-sgalaxy.o
subdir-$(CONFIG_SND) += ad1816a ad1848 cs423x es1688 gus opti9xx sb wavefront
ifeq ($(CONFIG_SND),y)
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
......@@ -3,6 +3,7 @@
# 18 Apr 1998, Michael Elizabeth Chastain, <mailto:mec@shout.net>
# Rewritten to use lists instead of if-statements.
O_TARGET := _oss.o
# All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
......@@ -81,17 +82,17 @@ subdir-$(CONFIG_SOUND_EMU10K1) += emu10k1
subdir-$(CONFIG_SOUND_CS4281) += cs4281
ifeq ($(CONFIG_SOUND_EMU10K1),y)
obj-y += emu10k1/emu10k1.o
obj-y += emu10k1/_emu10k1.o
endif
ifeq ($(CONFIG_SOUND_CS4281),y)
obj-y += cs4281/cs4281.o
obj-y += cs4281/_cs4281.o
endif
subdir-$(CONFIG_DMASOUND) += dmasound
ifeq ($(CONFIG_DMASOUND),y)
obj-y += dmasound/dmasound.o
obj-y += dmasound/_dmasound.o
endif
......@@ -111,8 +112,6 @@ vidc_mod-objs := vidc.o vidc_fill.o
wavefront-objs := wavfront.o wf_midi.o yss225.o
O_TARGET := sounddrivers.o
include $(TOPDIR)/Rules.make
# Firmware files that need translation
......
# Makefile for Cirrus Logic-Crystal CS4281
#
O_TARGET := cs4281.o
O_TARGET := _cs4281.o
obj-y := cs4281m.o
obj-m := $(O_TARGET)
obj-$(CONFIG_SOUND_CS4281) += cs4281.o
include $(TOPDIR)/Rules.make
cs4281-objs += cs4281m.o
clean:
rm -f core *.o *.a *.s
include $(TOPDIR)/Rules.make
......@@ -7,6 +7,8 @@
#
# Note 2! The CFLAGS definitions are now in the main makefile...
O_TARGET = _dmasound.o
export-objs := dmasound_core.o
obj-$(CONFIG_DMASOUND_ATARI) += dmasound_core.o dmasound_atari.o
......@@ -14,8 +16,4 @@ obj-$(CONFIG_DMASOUND_AWACS) += dmasound_core.o dmasound_awacs.o
obj-$(CONFIG_DMASOUND_PAULA) += dmasound_core.o dmasound_paula.o
obj-$(CONFIG_DMASOUND_Q40) += dmasound_core.o dmasound_q40.o
ifeq ($(CONFIG_DMASOUND),y)
O_TARGET = dmasound.o
endif
include $(TOPDIR)/Rules.make
......@@ -2,12 +2,13 @@
#
# 12 Apr 2000 Rui Sousa
O_TARGET := emu10k1.o
O_TARGET := _emu10k1.o
obj-y := audio.o cardmi.o cardmo.o cardwi.o cardwo.o ecard.o \
obj-$(CONFIG_SOUND_EMU10K1) += emu10k1.o
emu10k1-objs := audio.o cardmi.o cardmo.o cardwi.o cardwo.o ecard.o \
efxmgr.o emuadxmg.o hwaccess.o irqmgr.o main.o midi.o \
mixer.o passthrough.o recmgr.o timer.o voicemgr.o
obj-m := $(O_TARGET)
ifdef DEBUG
EXTRA_CFLAGS += -DEMU10K1_DEBUG
......@@ -18,6 +19,3 @@ ifdef CONFIG_MIDI_EMU10K1
endif
include $(TOPDIR)/Rules.make
clean:
rm -f core *.o *.a *.s
......@@ -3,10 +3,9 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
#
O_TARGET := pci.o
O_TARGET := _pci.o
subdir-y := ac97 ali5451 cs46xx emu10k1 korg1212 nm256 rme9652 trident ymfpci
subdir-m := $(subdir-y)
mod-subdirs := ac97 ali5451 cs46xx emu10k1 korg1212 nm256 rme9652 trident ymfpci
snd-als4000-objs := als4000.o
snd-cmipci-objs := cmipci.o
......@@ -43,4 +42,17 @@ obj-$(CONFIG_SND_SONICVIBES) += snd-sonicvibes.o
obj-$(CONFIG_SND_VIA686) += snd-via686.o
obj-$(CONFIG_SND_VIA8233) += snd-via8233.o
subdir-$(CONFIG_SND) += ac97 ali5451 cs46xx emu10k1 korg1212 nm256 rme9652 trident ymfpci
ifeq ($(CONFIG_SND),y)
obj-y += ac97/_ac97.o \
ali5451/_ali5451.o \
cs46xx/_cs46xx.o \
emu10k1/_emu10k1.o \
korg1212/_korg1212.o \
nm256/_nm256.o \
rme9652/_rme9652.o \
trident/_trident.o \
ymfpci/_ymfpci.o
endif
include $(TOPDIR)/Rules.make
......@@ -3,7 +3,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
#
O_TARGET := ppc.o
O_TARGET := _ppc.o
snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o
......
......@@ -3,10 +3,9 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
#
O_TARGET := synth.o
O_TARGET := _synth.o
subdir-y := emux
subdir-m := $(subdir-y)
mod-subdirs := emux
export-objs := util_mem.o
......@@ -19,4 +18,9 @@ ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
obj-$(CONFIG_SND_SBAWE) += snd-util-mem.o
endif
subdir-$(CONFIG_SND) += emux
ifeq ($(CONFIG_SND),y)
obj-y += emux/_emux.o
endif
include $(TOPDIR)/Rules.make
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