gwj / at91sam9263 · Commits

Commit 5f87762742923e42114ed49c96251a245f109147

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent 943e0a31

Rename SOUND_HW to sound-obj-y 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 1 changed file with 7 additions and 7 deletions
Makefile.target
  View file @5f87762
@@ -515,16 +515,16 @@ ifdef CONFIG_OSS @@ -515,16 +515,16 @@ ifdef CONFIG_OSS
515 LIBS += $(CONFIG_OSS_LIB) 515 LIBS += $(CONFIG_OSS_LIB)
516 endif 516 endif
517 517
518 -SOUND_HW = sb16.o es1370.o ac97.o 518 +sound-obj-y = sb16.o es1370.o ac97.o
519 ifdef CONFIG_ADLIB 519 ifdef CONFIG_ADLIB
520 -SOUND_HW += fmopl.o adlib.o 520 +sound-obj-y += fmopl.o adlib.o
521 adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0 521 adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0
522 endif 522 endif
523 ifdef CONFIG_GUS 523 ifdef CONFIG_GUS
524 -SOUND_HW += gus.o gusemu_hal.o gusemu_mixer.o 524 +sound-obj-y += gus.o gusemu_hal.o gusemu_mixer.o
525 endif 525 endif
526 ifdef CONFIG_CS4231A 526 ifdef CONFIG_CS4231A
527 -SOUND_HW += cs4231a.o 527 +sound-obj-y += cs4231a.o
528 endif 528 endif
529 529
530 ifdef CONFIG_VNC_TLS 530 ifdef CONFIG_VNC_TLS
@@ -562,7 +562,7 @@ obj-y += wdt_ib700.o wdt_i6300esb.o @@ -562,7 +562,7 @@ obj-y += wdt_ib700.o wdt_i6300esb.o
562 562
563 ifeq ($(TARGET_BASE_ARCH), i386) 563 ifeq ($(TARGET_BASE_ARCH), i386)
564 # Hardware support 564 # Hardware support
565 -obj-y += ide.o pckbd.o vga.o $(SOUND_HW) dma.o 565 +obj-y += ide.o pckbd.o vga.o $(sound-obj-y) dma.o
566 obj-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o 566 obj-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
567 obj-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o 567 obj-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o
568 obj-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o 568 obj-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
@@ -572,7 +572,7 @@ endif @@ -572,7 +572,7 @@ endif
572 ifeq ($(TARGET_BASE_ARCH), ppc) 572 ifeq ($(TARGET_BASE_ARCH), ppc)
573 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE 573 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
574 # shared objects 574 # shared objects
575 -obj-y += ppc.o ide.o vga.o $(SOUND_HW) dma.o openpic.o 575 +obj-y += ppc.o ide.o vga.o $(sound-obj-y) dma.o openpic.o
576 # PREP target 576 # PREP target
577 obj-y += pckbd.o serial.o i8259.o i8254.o fdc.o mc146818rtc.o 577 obj-y += pckbd.o serial.o i8259.o i8254.o fdc.o mc146818rtc.o
578 obj-y += prep_pci.o ppc_prep.o 578 obj-y += prep_pci.o ppc_prep.o
@@ -598,7 +598,7 @@ obj-y += mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o @@ -598,7 +598,7 @@ obj-y += mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
598 obj-y += mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o 598 obj-y += mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o
599 obj-y += g364fb.o jazz_led.o dp8393x.o 599 obj-y += g364fb.o jazz_led.o dp8393x.o
600 obj-y += ide.o gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o 600 obj-y += ide.o gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o
601 -obj-y += piix_pci.o parallel.o cirrus_vga.o pcspk.o $(SOUND_HW) 601 +obj-y += piix_pci.o parallel.o cirrus_vga.o pcspk.o $(sound-obj-y)
602 obj-y += mipsnet.o 602 obj-y += mipsnet.o
603 obj-y += pflash_cfi01.o 603 obj-y += pflash_cfi01.o
604 obj-y += vmware_vga.o 604 obj-y += vmware_vga.o