Compile pcspk only once

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

8 files changed, 9 insertions, 2 deletions

diff --git a/Makefile.objs b/Makefile.objs
index 17feeb0f7c..85451f3630 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -139,6 +139,7 @@ hw-obj-$(CONFIG_ESCC) += escc.o
 
 hw-obj-$(CONFIG_PARALLEL) += parallel.o
 hw-obj-$(CONFIG_I8254) += i8254.o
+hw-obj-$(CONFIG_PCSPK) += pcspk.o
 
 # PCI watchdog devices
 hw-obj-y += wdt_i6300esb.o
diff --git a/Makefile.target b/Makefile.target
index 378b1ac3f1..904ace5558 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -200,7 +200,7 @@ obj-y += e1000.o
 obj-i386-y = ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o
 obj-i386-y += pckbd.o $(sound-obj-y) dma.o
 obj-i386-y += vga.o vga-isa.o
-obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o pcspk.o pc.o
+obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o pc.o
 obj-i386-y += cirrus_vga.o apic.o ioapic.o acpi.o piix_pci.o
 obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
 obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o
@@ -234,7 +234,7 @@ obj-mips-y += vga-isa.o vga-isa-mm.o
 obj-mips-y += g364fb.o jazz_led.o dp8393x.o
 obj-mips-y += ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o
 obj-mips-y += gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o
-obj-mips-y += piix4.o cirrus_vga.o pcspk.o $(sound-obj-y)
+obj-mips-y += piix4.o cirrus_vga.o $(sound-obj-y)
 obj-mips-y += mipsnet.o ne2000-isa.o
 obj-mips-y += pflash_cfi01.o
 obj-mips-y += vmware_vga.o
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index ea5039754d..a0137b1629 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -4,3 +4,4 @@ CONFIG_USB_OHCI=y
 CONFIG_VGA_PCI=y
 CONFIG_PARALLEL=y
 CONFIG_I8254=y
+CONFIG_PCSPK=y
diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
index 1778262793..02193a3aa9 100644
--- a/default-configs/mips-softmmu.mak
+++ b/default-configs/mips-softmmu.mak
@@ -5,3 +5,4 @@ CONFIG_ESP=y
 CONFIG_VGA_PCI=y
 CONFIG_PARALLEL=y
 CONFIG_I8254=y
+CONFIG_PCSPK=y
diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
index e672e0b3aa..8dffae9fef 100644
--- a/default-configs/mips64-softmmu.mak
+++ b/default-configs/mips64-softmmu.mak
@@ -5,3 +5,4 @@ CONFIG_ESP=y
 CONFIG_VGA_PCI=y
 CONFIG_PARALLEL=y
 CONFIG_I8254=y
+CONFIG_PCSPK=y
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index 641db27b17..a5917c1935 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -5,3 +5,4 @@ CONFIG_ESP=y
 CONFIG_VGA_PCI=y
 CONFIG_PARALLEL=y
 CONFIG_I8254=y
+CONFIG_PCSPK=y
diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak
index d054572fdf..4f3b933d10 100644
--- a/default-configs/mipsel-softmmu.mak
+++ b/default-configs/mipsel-softmmu.mak
@@ -5,3 +5,4 @@ CONFIG_ESP=y
 CONFIG_VGA_PCI=y
 CONFIG_PARALLEL=y
 CONFIG_I8254=y
+CONFIG_PCSPK=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index 92061de42f..be72995ef3 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -4,3 +4,4 @@ CONFIG_USB_OHCI=y
 CONFIG_VGA_PCI=y
 CONFIG_PARALLEL=y
 CONFIG_I8254=y
+CONFIG_PCSPK=y