gwj / at91sam9263 · Commits

Commit eda959bda7db6a9db7fe63c9a932526296e4271a

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent 319f08ea

Rename AUDIO_OBJS to audio-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 12 additions and 12 deletions
Makefile
  View file @eda959b
... ... @@ -123,45 +123,45 @@ else
123 123 OBJS+=migration-exec.o
124 124 endif
125 125  
126   -AUDIO_OBJS = audio.o noaudio.o wavaudio.o mixeng.o
  126 +audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
127 127 ifdef CONFIG_SDL
128   -AUDIO_OBJS += sdlaudio.o
  128 +audio-obj-y += sdlaudio.o
129 129 endif
130 130 ifdef CONFIG_OSS
131   -AUDIO_OBJS += ossaudio.o
  131 +audio-obj-y += ossaudio.o
132 132 endif
133 133 ifdef CONFIG_COREAUDIO
134   -AUDIO_OBJS += coreaudio.o
  134 +audio-obj-y += coreaudio.o
135 135 AUDIO_PT = yes
136 136 endif
137 137 ifdef CONFIG_ALSA
138   -AUDIO_OBJS += alsaaudio.o
  138 +audio-obj-y += alsaaudio.o
139 139 endif
140 140 ifdef CONFIG_DSOUND
141   -AUDIO_OBJS += dsoundaudio.o
  141 +audio-obj-y += dsoundaudio.o
142 142 endif
143 143 ifdef CONFIG_FMOD
144   -AUDIO_OBJS += fmodaudio.o
  144 +audio-obj-y += fmodaudio.o
145 145 audio/audio.o audio/fmodaudio.o: CPPFLAGS := -I$(CONFIG_FMOD_INC) $(CPPFLAGS)
146 146 endif
147 147 ifdef CONFIG_ESD
148 148 AUDIO_PT = yes
149 149 AUDIO_PT_INT = yes
150   -AUDIO_OBJS += esdaudio.o
  150 +audio-obj-y += esdaudio.o
151 151 endif
152 152 ifdef CONFIG_PA
153 153 AUDIO_PT = yes
154 154 AUDIO_PT_INT = yes
155   -AUDIO_OBJS += paaudio.o
  155 +audio-obj-y += paaudio.o
156 156 endif
157 157 ifdef AUDIO_PT
158 158 LDFLAGS += -pthread
159 159 endif
160 160 ifdef AUDIO_PT_INT
161   -AUDIO_OBJS += audio_pt_int.o
  161 +audio-obj-y += audio_pt_int.o
162 162 endif
163   -AUDIO_OBJS+= wavcapture.o
164   -OBJS+=$(addprefix audio/, $(AUDIO_OBJS))
  163 +audio-obj-y += wavcapture.o
  164 +OBJS+=$(addprefix audio/, $(audio-obj-y))
165 165  
166 166 OBJS+=keymaps.o
167 167 ifdef CONFIG_SDL
... ...