gwj / at91sam9263 · Commits

Commit 6ef859b3f4c3d2e6ba7c8fed2c9fae9ba82f6f13

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent e11b1dce

Rename OBJS to 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 33 additions and 33 deletions
Makefile
  View file @6ef859b
... ... @@ -93,34 +93,34 @@ endif
93 93 # system emulation, i.e. a single QEMU executable should support all
94 94 # CPUs and machines.
95 95  
96   -OBJS=$(block-obj-y)
97   -OBJS+=readline.o console.o
98   -
99   -OBJS+=irq.o ptimer.o
100   -OBJS+=i2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o
101   -OBJS+=ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o
102   -OBJS+=tmp105.o lm832x.o eeprom93xx.o tsc2005.o
103   -OBJS+=scsi-disk.o cdrom.o
104   -OBJS+=scsi-generic.o
105   -OBJS+=usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o
106   -OBJS+=usb-serial.o usb-net.o
107   -OBJS+=sd.o ssi-sd.o
108   -OBJS+=bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o
109   -OBJS+=bt-hci-csr.o
110   -OBJS+=buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o
111   -OBJS+=qemu-char.o aio.o net-checksum.o savevm.o cache-utils.o
112   -OBJS+=msmouse.o ps2.o
113   -OBJS+=qdev.o ssi.o
  96 +obj-y = $(block-obj-y)
  97 +obj-y += readline.o console.o
  98 +
  99 +obj-y += irq.o ptimer.o
  100 +obj-y += i2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o
  101 +obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o
  102 +obj-y += tmp105.o lm832x.o eeprom93xx.o tsc2005.o
  103 +obj-y += scsi-disk.o cdrom.o
  104 +obj-y += scsi-generic.o
  105 +obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o
  106 +obj-y += usb-serial.o usb-net.o
  107 +obj-y += sd.o ssi-sd.o
  108 +obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o
  109 +obj-y += bt-hci-csr.o
  110 +obj-y += buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o
  111 +obj-y += qemu-char.o aio.o net-checksum.o savevm.o cache-utils.o
  112 +obj-y += msmouse.o ps2.o
  113 +obj-y += qdev.o ssi.o
114 114  
115 115 ifdef CONFIG_BRLAPI
116   -OBJS+= baum.o
  116 +obj-y += baum.o
117 117 LIBS+=-lbrlapi
118 118 endif
119 119  
120 120 ifdef CONFIG_WIN32
121   -OBJS+=tap-win32.o
  121 +obj-y += tap-win32.o
122 122 else
123   -OBJS+=migration-exec.o
  123 +obj-y += migration-exec.o
124 124 endif
125 125  
126 126 audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
... ... @@ -161,29 +161,29 @@ ifdef AUDIO_PT_INT
161 161 audio-obj-y += audio_pt_int.o
162 162 endif
163 163 audio-obj-y += wavcapture.o
164   -OBJS+=$(addprefix audio/, $(audio-obj-y))
  164 +obj-y += $(addprefix audio/, $(audio-obj-y))
165 165  
166   -OBJS+=keymaps.o
  166 +obj-y += keymaps.o
167 167 ifdef CONFIG_SDL
168   -OBJS+=sdl.o sdl_zoom.o x_keymap.o
  168 +obj-y += sdl.o sdl_zoom.o x_keymap.o
169 169 endif
170 170 ifdef CONFIG_CURSES
171   -OBJS+=curses.o
  171 +obj-y += curses.o
172 172 endif
173   -OBJS+=vnc.o acl.o d3des.o
  173 +obj-y += vnc.o acl.o d3des.o
174 174 ifdef CONFIG_VNC_TLS
175   -OBJS+=vnc-tls.o vnc-auth-vencrypt.o
  175 +obj-y += vnc-tls.o vnc-auth-vencrypt.o
176 176 endif
177 177 ifdef CONFIG_VNC_SASL
178   -OBJS+=vnc-auth-sasl.o
  178 +obj-y += vnc-auth-sasl.o
179 179 endif
180 180  
181 181 ifdef CONFIG_COCOA
182   -OBJS+=cocoa.o
  182 +obj-y += cocoa.o
183 183 endif
184 184  
185 185 ifdef CONFIG_IOTHREAD
186   -OBJS+=qemu-thread.o
  186 +obj-y += qemu-thread.o
187 187 endif
188 188  
189 189 ifdef CONFIG_SLIRP
... ... @@ -191,7 +191,7 @@ CPPFLAGS+=-I$(SRC_PATH)/slirp
191 191 slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o
192 192 slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o
193 193 slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o
194   -OBJS+=$(addprefix slirp/, $(slirp-obj-y))
  194 +obj-y += $(addprefix slirp/, $(slirp-obj-y))
195 195 endif
196 196  
197 197 LIBS+=$(VDE_LIBS)
... ... @@ -200,7 +200,7 @@ LIBS+=$(VDE_LIBS)
200 200 xen-obj-y := xen_backend.o xen_devconfig.o
201 201 xen-obj-y += xen_console.o xenfb.o xen_disk.o xen_nic.o
202 202 ifdef CONFIG_XEN
203   - OBJS += $(xen-obj-y)
  203 + obj-y += $(xen-obj-y)
204 204 endif
205 205  
206 206 LIBS+=$(CURL_LIBS)
... ... @@ -233,7 +233,7 @@ curses.o: curses.c keymaps.h curses_keys.h
233 233  
234 234 bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS)
235 235  
236   -libqemu_common.a: $(OBJS)
  236 +libqemu_common.a: $(obj-y)
237 237  
238 238 #######################################################################
239 239 # user-obj-y is code used by qemu userspace emulation
... ...