Compile sound devices only once (70615c38) · Commits · SUMMER2020 / students / proj-2021291

Makefile.objs

+12 −0

Original line number	Diff line number	Diff line
		@@ -178,6 +178,18 @@ hw-obj-$(CONFIG_QDEV_ADDR) += qdev-addr.o
		hw-obj-$(CONFIG_VGA_PCI) += vga-pci.o
		hw-obj-$(CONFIG_VGA_ISA) += vga-isa.o

		# Sound
		sound-obj-y =
		sound-obj-$(CONFIG_SB16) += sb16.o
		sound-obj-$(CONFIG_ES1370) += es1370.o
		sound-obj-$(CONFIG_AC97) += ac97.o
		sound-obj-$(CONFIG_ADLIB) += fmopl.o adlib.o
		sound-obj-$(CONFIG_GUS) += gus.o gusemu_hal.o gusemu_mixer.o
		sound-obj-$(CONFIG_CS4231A) += cs4231a.o

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

		######################################################################
		# libdis
		# NOTE: the disassembler code is only needed for debugging

+3 −13

Original line number	Diff line number	Diff line
		@@ -170,16 +170,6 @@ obj-y += rwhandler.o
		obj-$(CONFIG_KVM) += kvm.o kvm-all.o
		LIBS+=-lz

		sound-obj-y =
		sound-obj-$(CONFIG_SB16) += sb16.o
		sound-obj-$(CONFIG_ES1370) += es1370.o
		sound-obj-$(CONFIG_AC97) += ac97.o
		sound-obj-$(CONFIG_ADLIB) += fmopl.o adlib.o
		sound-obj-$(CONFIG_GUS) += gus.o gusemu_hal.o gusemu_mixer.o
		sound-obj-$(CONFIG_CS4231A) += cs4231a.o

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

		QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
		QEMU_CFLAGS += $(VNC_SASL_CFLAGS)

		@@ -192,7 +182,7 @@ obj-y += e1000.o

		# Hardware support
		obj-i386-y = ide/core.o
		obj-i386-y += pckbd.o $(sound-obj-y) dma.o
		obj-i386-y += pckbd.o dma.o
		obj-i386-y += vga.o
		obj-i386-y += mc146818rtc.o i8259.o pc.o
		obj-i386-y += cirrus_vga.o apic.o ioapic.o acpi.o piix_pci.o
		@@ -202,7 +192,7 @@ obj-i386-y += debugcon.o multiboot.o

		# shared objects
		obj-ppc-y = ppc.o ide/core.o ide/macio.o
		obj-ppc-y += vga.o $(sound-obj-y) dma.o openpic.o
		obj-ppc-y += vga.o dma.o openpic.o
		# PREP target
		obj-ppc-y += pckbd.o i8259.o mc146818rtc.o
		obj-ppc-y += prep_pci.o ppc_prep.o
		@@ -227,7 +217,7 @@ obj-mips-y += vga-isa-mm.o
		obj-mips-y += g364fb.o jazz_led.o dp8393x.o
		obj-mips-y += ide/core.o
		obj-mips-y += gt64xxx.o pckbd.o mc146818rtc.o acpi.o ds1225y.o
		obj-mips-y += piix4.o cirrus_vga.o $(sound-obj-y)
		obj-mips-y += piix4.o cirrus_vga.o
		obj-mips-y += mipsnet.o
		obj-mips-y += pflash_cfi01.o
		obj-mips-y += vmware_vga.o

+2 −0

+1 −0

+1 −0