gwj / at91sam9263 · Commits

Commit b6271b484c94d31c04fa14f10e798f0f012afc60

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent 5f877627

Substitute ifdef CONFIG_FOO by sound-obj- 

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 8 additions and 8 deletions
Makefile.target
  View file @b6271b4
@@ -515,17 +515,17 @@ ifdef CONFIG_OSS @@ -515,17 +515,17 @@ ifdef CONFIG_OSS
515 LIBS += $(CONFIG_OSS_LIB) 515 LIBS += $(CONFIG_OSS_LIB)
516 endif 516 endif
517 517
518 -sound-obj-y = sb16.o es1370.o ac97.o 518 +sound-obj-y =
  519 +sound-obj-$(CONFIG_SB16) += sb16.o
  520 +sound-obj-$(CONFIG_ES1370) += es1370.o
  521 +sound-obj-$(CONFIG_AC97) += ac97.o
  522 +sound-obj-$(CONFIG_ADLIB) += fmopl.o adlib.o
  523 +sound-obj-$(CONFIG_GUS) += gus.o gusemu_hal.o gusemu_mixer.o
  524 +sound-obj-$(CONFIG_CS4321A) += cs4231a.o
  525 +
519 ifdef CONFIG_ADLIB 526 ifdef CONFIG_ADLIB
520 -sound-obj-y += fmopl.o adlib.o  
521 adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0 527 adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0
522 endif 528 endif
523 -ifdef CONFIG_GUS  
524 -sound-obj-y += gus.o gusemu_hal.o gusemu_mixer.o  
525 -endif  
526 -ifdef CONFIG_CS4231A  
527 -sound-obj-y += cs4231a.o  
528 -endif  
529 529
530 ifdef CONFIG_VNC_TLS 530 ifdef CONFIG_VNC_TLS
531 CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS) 531 CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS)