Revision 70615c38

b/Makefile.objs
178 178
hw-obj-$(CONFIG_VGA_PCI) += vga-pci.o
179 179
hw-obj-$(CONFIG_VGA_ISA) += vga-isa.o
180 180

  
181
# Sound
182
sound-obj-y =
183
sound-obj-$(CONFIG_SB16) += sb16.o
184
sound-obj-$(CONFIG_ES1370) += es1370.o
185
sound-obj-$(CONFIG_AC97) += ac97.o
186
sound-obj-$(CONFIG_ADLIB) += fmopl.o adlib.o
187
sound-obj-$(CONFIG_GUS) += gus.o gusemu_hal.o gusemu_mixer.o
188
sound-obj-$(CONFIG_CS4231A) += cs4231a.o
189

  
190
adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0
191
hw-obj-$(CONFIG_SOUND) += $(sound-obj-y)
192

  
181 193
######################################################################
182 194
# libdis
183 195
# NOTE: the disassembler code is only needed for debugging
b/Makefile.target
170 170
obj-$(CONFIG_KVM) += kvm.o kvm-all.o
171 171
LIBS+=-lz
172 172

  
173
sound-obj-y =
174
sound-obj-$(CONFIG_SB16) += sb16.o
175
sound-obj-$(CONFIG_ES1370) += es1370.o
176
sound-obj-$(CONFIG_AC97) += ac97.o
177
sound-obj-$(CONFIG_ADLIB) += fmopl.o adlib.o
178
sound-obj-$(CONFIG_GUS) += gus.o gusemu_hal.o gusemu_mixer.o
179
sound-obj-$(CONFIG_CS4231A) += cs4231a.o
180

  
181
adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0
182

  
183 173
QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
184 174
QEMU_CFLAGS += $(VNC_SASL_CFLAGS)
185 175

  
......
192 182

  
193 183
# Hardware support
194 184
obj-i386-y = ide/core.o
195
obj-i386-y += pckbd.o $(sound-obj-y) dma.o
185
obj-i386-y += pckbd.o dma.o
196 186
obj-i386-y += vga.o
197 187
obj-i386-y += mc146818rtc.o i8259.o pc.o
198 188
obj-i386-y += cirrus_vga.o apic.o ioapic.o acpi.o piix_pci.o
......
202 192

  
203 193
# shared objects
204 194
obj-ppc-y = ppc.o ide/core.o ide/macio.o
205
obj-ppc-y += vga.o $(sound-obj-y) dma.o openpic.o
195
obj-ppc-y += vga.o dma.o openpic.o
206 196
# PREP target
207 197
obj-ppc-y += pckbd.o i8259.o mc146818rtc.o
208 198
obj-ppc-y += prep_pci.o ppc_prep.o
......
227 217
obj-mips-y += g364fb.o jazz_led.o dp8393x.o
228 218
obj-mips-y += ide/core.o
229 219
obj-mips-y += gt64xxx.o pckbd.o mc146818rtc.o acpi.o ds1225y.o
230
obj-mips-y += piix4.o cirrus_vga.o $(sound-obj-y)
220
obj-mips-y += piix4.o cirrus_vga.o
231 221
obj-mips-y += mipsnet.o
232 222
obj-mips-y += pflash_cfi01.o
233 223
obj-mips-y += vmware_vga.o
b/default-configs/i386-softmmu.mak
14 14
CONFIG_IDE_ISA=y
15 15
CONFIG_IDE_PIIX=y
16 16
CONFIG_NE2000_ISA=y
17
CONFIG_PIIX_PCI=y
18
CONFIG_SOUND=y
b/default-configs/mips-softmmu.mak
15 15
CONFIG_IDE_ISA=y
16 16
CONFIG_IDE_PIIX=y
17 17
CONFIG_NE2000_ISA=y
18
CONFIG_SOUND=y
b/default-configs/mips64-softmmu.mak
15 15
CONFIG_IDE_ISA=y
16 16
CONFIG_IDE_PIIX=y
17 17
CONFIG_NE2000_ISA=y
18
CONFIG_SOUND=y
b/default-configs/mips64el-softmmu.mak
15 15
CONFIG_IDE_ISA=y
16 16
CONFIG_IDE_PIIX=y
17 17
CONFIG_NE2000_ISA=y
18
CONFIG_SOUND=y
b/default-configs/mipsel-softmmu.mak
15 15
CONFIG_IDE_ISA=y
16 16
CONFIG_IDE_PIIX=y
17 17
CONFIG_NE2000_ISA=y
18
CONFIG_SOUND=y
b/default-configs/ppc-softmmu.mak
14 14
CONFIG_IDE_ISA=y
15 15
CONFIG_IDE_CMD646=y
16 16
CONFIG_NE2000_ISA=y
17
CONFIG_SOUND=y
b/default-configs/ppc64-softmmu.mak
14 14
CONFIG_IDE_ISA=y
15 15
CONFIG_IDE_CMD646=y
16 16
CONFIG_NE2000_ISA=y
17
CONFIG_SOUND=y
b/default-configs/ppcemb-softmmu.mak
14 14
CONFIG_IDE_ISA=y
15 15
CONFIG_IDE_CMD646=y
16 16
CONFIG_NE2000_ISA=y
17
CONFIG_SOUND=y
b/default-configs/x86_64-softmmu.mak
14 14
CONFIG_IDE_ISA=y
15 15
CONFIG_IDE_PIIX=y
16 16
CONFIG_NE2000_ISA=y
17
CONFIG_PIIX_PCI=y
18
CONFIG_SOUND=y

Also available in: Unified diff