gwj / at91sam9263 · Commits

Commit 0e22fd2f1168a633a2c64594505e7683017f49a9

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent e34af2ce

Substitute ifdef CONFIG_FOO by 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 25 additions and 51 deletions
Makefile
  View file @0e22fd2
@@ -83,9 +83,7 @@ endif @@ -83,9 +83,7 @@ endif
83 block-obj-y += block/raw-posix.o 83 block-obj-y += block/raw-posix.o
84 endif 84 endif
85 85
86 -ifdef CONFIG_CURL  
87 -block-obj-y += block/curl.o  
88 -endif 86 +block-obj-$(CONFIG_CURL) += block/curl.o
89 87
90 ###################################################################### 88 ######################################################################
91 # libqemu_common.a: Target independent part of system emulation. The 89 # libqemu_common.a: Target independent part of system emulation. The
@@ -112,8 +110,9 @@ obj-y += qemu-char.o aio.o net-checksum.o savevm.o cache-utils.o @@ -112,8 +110,9 @@ obj-y += qemu-char.o aio.o net-checksum.o savevm.o cache-utils.o
112 obj-y += msmouse.o ps2.o 110 obj-y += msmouse.o ps2.o
113 obj-y += qdev.o ssi.o 111 obj-y += qdev.o ssi.o
114 112
  113 +obj-$(CONFIG_BRLAPI) += baum.o
  114 +
115 ifdef CONFIG_BRLAPI 115 ifdef CONFIG_BRLAPI
116 -obj-y += baum.o  
117 LIBS+=-lbrlapi 116 LIBS+=-lbrlapi
118 endif 117 endif
119 118
@@ -123,85 +122,60 @@ else @@ -123,85 +122,60 @@ else
123 obj-y += migration-exec.o 122 obj-y += migration-exec.o
124 endif 123 endif
125 124
126 -audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o  
127 -ifdef CONFIG_SDL  
128 -audio-obj-y += sdlaudio.o  
129 -endif  
130 -ifdef CONFIG_OSS  
131 -audio-obj-y += ossaudio.o  
132 -endif  
133 ifdef CONFIG_COREAUDIO 125 ifdef CONFIG_COREAUDIO
134 -audio-obj-y += coreaudio.o  
135 AUDIO_PT = yes 126 AUDIO_PT = yes
136 endif 127 endif
137 -ifdef CONFIG_ALSA  
138 -audio-obj-y += alsaaudio.o  
139 -endif  
140 -ifdef CONFIG_DSOUND  
141 -audio-obj-y += dsoundaudio.o  
142 -endif  
143 ifdef CONFIG_FMOD 128 ifdef CONFIG_FMOD
144 -audio-obj-y += fmodaudio.o  
145 audio/audio.o audio/fmodaudio.o: CPPFLAGS := -I$(CONFIG_FMOD_INC) $(CPPFLAGS) 129 audio/audio.o audio/fmodaudio.o: CPPFLAGS := -I$(CONFIG_FMOD_INC) $(CPPFLAGS)
146 endif 130 endif
147 ifdef CONFIG_ESD 131 ifdef CONFIG_ESD
148 AUDIO_PT = yes 132 AUDIO_PT = yes
149 AUDIO_PT_INT = yes 133 AUDIO_PT_INT = yes
150 -audio-obj-y += esdaudio.o  
151 endif 134 endif
152 ifdef CONFIG_PA 135 ifdef CONFIG_PA
153 AUDIO_PT = yes 136 AUDIO_PT = yes
154 AUDIO_PT_INT = yes 137 AUDIO_PT_INT = yes
155 -audio-obj-y += paaudio.o  
156 endif 138 endif
157 ifdef AUDIO_PT 139 ifdef AUDIO_PT
158 LDFLAGS += -pthread 140 LDFLAGS += -pthread
159 endif 141 endif
160 -ifdef AUDIO_PT_INT  
161 -audio-obj-y += audio_pt_int.o  
162 -endif 142 +
  143 +audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
  144 +audio-obj-$(CONFIG_SDL) += sdlaudio.o
  145 +audio-obj-$(CONFIG_OSS) += ossaudio.o
  146 +audio-obj-$(CONFIG_COREAUDIO) += coreaudio.o
  147 +audio-obj-$(CONFIG_ALSA) += alsaaudio.o
  148 +audio-obj-$(CONFIG_DSOUND) += dsoundaudio.o
  149 +audio-obj-$(CONFIG_FMOD) += fmodaudio.o
  150 +audio-obj-$(CONFIG_ESD) += esdaudio.o
  151 +audio-obj-$(CONFIG_PA) += paaudio.o
  152 +audio-obj-$(AUDIO_PT_INT) += audio_pt_int.o
163 audio-obj-y += wavcapture.o 153 audio-obj-y += wavcapture.o
164 obj-y += $(addprefix audio/, $(audio-obj-y)) 154 obj-y += $(addprefix audio/, $(audio-obj-y))
165 155
166 obj-y += keymaps.o 156 obj-y += keymaps.o
167 -ifdef CONFIG_SDL  
168 -obj-y += sdl.o sdl_zoom.o x_keymap.o  
169 -endif  
170 -ifdef CONFIG_CURSES  
171 -obj-y += curses.o  
172 -endif 157 +obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o
  158 +obj-$(CONFIG_CURSES) += curses.o
173 obj-y += vnc.o acl.o d3des.o 159 obj-y += vnc.o acl.o d3des.o
174 -ifdef CONFIG_VNC_TLS  
175 -obj-y += vnc-tls.o vnc-auth-vencrypt.o  
176 -endif  
177 -ifdef CONFIG_VNC_SASL  
178 -obj-y += vnc-auth-sasl.o  
179 -endif  
180 -  
181 -ifdef CONFIG_COCOA  
182 -obj-y += cocoa.o  
183 -endif  
184 -  
185 -ifdef CONFIG_IOTHREAD  
186 -obj-y += qemu-thread.o  
187 -endif 160 +obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o
  161 +obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o
  162 +obj-$(CONFIG_COCOA) += cocoa.o
  163 +obj-$(CONFIG_IOTHREAD) += qemu-thread.o
188 164
189 ifdef CONFIG_SLIRP 165 ifdef CONFIG_SLIRP
190 CPPFLAGS+=-I$(SRC_PATH)/slirp 166 CPPFLAGS+=-I$(SRC_PATH)/slirp
  167 +endif
  168 +
191 slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o 169 slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o
192 slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o 170 slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o
193 slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o 171 slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o
194 -obj-y += $(addprefix slirp/, $(slirp-obj-y))  
195 -endif 172 +obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y))
196 173
197 LIBS+=$(VDE_LIBS) 174 LIBS+=$(VDE_LIBS)
198 175
199 # xen backend driver support 176 # xen backend driver support
200 -xen-obj-y := xen_backend.o xen_devconfig.o  
201 -xen-obj-y += xen_console.o xenfb.o xen_disk.o xen_nic.o  
202 -ifdef CONFIG_XEN  
203 - obj-y += $(xen-obj-y)  
204 -endif 177 +obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o
  178 +obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o
205 179
206 LIBS+=$(CURL_LIBS) 180 LIBS+=$(CURL_LIBS)
207 181