Commit c9e0df738918b1d5d39a283500abc3a3ac433f78
Committed by
Anthony Liguori
1 parent
4f3a1d56
Rename LIBOBJS to libobj-y
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Showing
1 changed file
with
24 additions
and
25 deletions
Makefile.target
@@ -134,43 +134,42 @@ all: $(PROGS) | @@ -134,43 +134,42 @@ all: $(PROGS) | ||
134 | 134 | ||
135 | ######################################################### | 135 | ######################################################### |
136 | # cpu emulator library | 136 | # cpu emulator library |
137 | -LIBOBJS=exec.o translate-all.o cpu-exec.o\ | ||
138 | - translate.o host-utils.o | 137 | +libobj-y = exec.o translate-all.o cpu-exec.o translate.o host-utils.o |
139 | ifdef CONFIG_KQEMU | 138 | ifdef CONFIG_KQEMU |
140 | -LIBOBJS+= kqemu.o | 139 | +libobj-y += kqemu.o |
141 | endif | 140 | endif |
142 | # TCG code generator | 141 | # TCG code generator |
143 | -LIBOBJS+= tcg/tcg.o tcg/tcg-runtime.o | 142 | +libobj-y += tcg/tcg.o tcg/tcg-runtime.o |
144 | CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH) | 143 | CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH) |
145 | ifeq ($(ARCH),sparc64) | 144 | ifeq ($(ARCH),sparc64) |
146 | CPPFLAGS+=-I$(SRC_PATH)/tcg/sparc | 145 | CPPFLAGS+=-I$(SRC_PATH)/tcg/sparc |
147 | endif | 146 | endif |
148 | ifdef CONFIG_SOFTFLOAT | 147 | ifdef CONFIG_SOFTFLOAT |
149 | -LIBOBJS+=fpu/softfloat.o | 148 | +libobj-y += fpu/softfloat.o |
150 | else | 149 | else |
151 | -LIBOBJS+=fpu/softfloat-native.o | 150 | +libobj-y += fpu/softfloat-native.o |
152 | endif | 151 | endif |
153 | CPPFLAGS+=-I$(SRC_PATH)/fpu | 152 | CPPFLAGS+=-I$(SRC_PATH)/fpu |
154 | -LIBOBJS+= op_helper.o helper.o | 153 | +libobj-y += op_helper.o helper.o |
155 | 154 | ||
156 | ifeq ($(TARGET_BASE_ARCH), arm) | 155 | ifeq ($(TARGET_BASE_ARCH), arm) |
157 | -LIBOBJS+= neon_helper.o iwmmxt_helper.o | 156 | +libobj-y += neon_helper.o iwmmxt_helper.o |
158 | endif | 157 | endif |
159 | 158 | ||
160 | ifeq ($(TARGET_BASE_ARCH), alpha) | 159 | ifeq ($(TARGET_BASE_ARCH), alpha) |
161 | -LIBOBJS+= alpha_palcode.o | 160 | +libobj-y += alpha_palcode.o |
162 | endif | 161 | endif |
163 | 162 | ||
164 | ifeq ($(TARGET_BASE_ARCH), cris) | 163 | ifeq ($(TARGET_BASE_ARCH), cris) |
165 | -LIBOBJS+= cris-dis.o | 164 | +libobj-y += cris-dis.o |
166 | 165 | ||
167 | ifndef CONFIG_USER_ONLY | 166 | ifndef CONFIG_USER_ONLY |
168 | -LIBOBJS+= mmu.o | 167 | +libobj-y += mmu.o |
169 | endif | 168 | endif |
170 | endif | 169 | endif |
171 | 170 | ||
172 | # NOTE: the disassembler code is only needed for debugging | 171 | # NOTE: the disassembler code is only needed for debugging |
173 | -LIBOBJS+=disas.o | 172 | +libobj-y += disas.o |
174 | ifeq ($(findstring i386, $(TARGET_ARCH) $(ARCH)),i386) | 173 | ifeq ($(findstring i386, $(TARGET_ARCH) $(ARCH)),i386) |
175 | USE_I386_DIS=y | 174 | USE_I386_DIS=y |
176 | endif | 175 | endif |
@@ -178,45 +177,45 @@ ifeq ($(findstring x86_64, $(TARGET_ARCH) $(ARCH)),x86_64) | @@ -178,45 +177,45 @@ ifeq ($(findstring x86_64, $(TARGET_ARCH) $(ARCH)),x86_64) | ||
178 | USE_I386_DIS=y | 177 | USE_I386_DIS=y |
179 | endif | 178 | endif |
180 | ifdef USE_I386_DIS | 179 | ifdef USE_I386_DIS |
181 | -LIBOBJS+=i386-dis.o | 180 | +libobj-y += i386-dis.o |
182 | endif | 181 | endif |
183 | ifeq ($(findstring alpha, $(TARGET_ARCH) $(ARCH)),alpha) | 182 | ifeq ($(findstring alpha, $(TARGET_ARCH) $(ARCH)),alpha) |
184 | -LIBOBJS+=alpha-dis.o | 183 | +libobj-y += alpha-dis.o |
185 | endif | 184 | endif |
186 | ifeq ($(findstring ppc, $(TARGET_BASE_ARCH) $(ARCH)),ppc) | 185 | ifeq ($(findstring ppc, $(TARGET_BASE_ARCH) $(ARCH)),ppc) |
187 | -LIBOBJS+=ppc-dis.o | 186 | +libobj-y += ppc-dis.o |
188 | endif | 187 | endif |
189 | ifeq ($(findstring microblaze, $(TARGET_BASE_ARCH) $(ARCH)),microblaze) | 188 | ifeq ($(findstring microblaze, $(TARGET_BASE_ARCH) $(ARCH)),microblaze) |
190 | -LIBOBJS+=microblaze-dis.o | 189 | +libobj-y += microblaze-dis.o |
191 | ifndef CONFIG_USER_ONLY | 190 | ifndef CONFIG_USER_ONLY |
192 | -LIBOBJS+= mmu.o | 191 | +libobj-y += mmu.o |
193 | endif | 192 | endif |
194 | endif | 193 | endif |
195 | ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips) | 194 | ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips) |
196 | -LIBOBJS+=mips-dis.o | 195 | +libobj-y += mips-dis.o |
197 | endif | 196 | endif |
198 | ifeq ($(findstring sparc, $(TARGET_BASE_ARCH) $(ARCH)),sparc) | 197 | ifeq ($(findstring sparc, $(TARGET_BASE_ARCH) $(ARCH)),sparc) |
199 | -LIBOBJS+=sparc-dis.o | 198 | +libobj-y += sparc-dis.o |
200 | endif | 199 | endif |
201 | ifeq ($(findstring arm, $(TARGET_ARCH) $(ARCH)),arm) | 200 | ifeq ($(findstring arm, $(TARGET_ARCH) $(ARCH)),arm) |
202 | -LIBOBJS+=arm-dis.o | 201 | +libobj-y += arm-dis.o |
203 | endif | 202 | endif |
204 | ifeq ($(findstring m68k, $(TARGET_ARCH) $(ARCH)),m68k) | 203 | ifeq ($(findstring m68k, $(TARGET_ARCH) $(ARCH)),m68k) |
205 | -LIBOBJS+=m68k-dis.o | 204 | +libobj-y += m68k-dis.o |
206 | endif | 205 | endif |
207 | ifeq ($(findstring sh4, $(TARGET_ARCH) $(ARCH)),sh4) | 206 | ifeq ($(findstring sh4, $(TARGET_ARCH) $(ARCH)),sh4) |
208 | -LIBOBJS+=sh4-dis.o | 207 | +libobj-y += sh4-dis.o |
209 | endif | 208 | endif |
210 | ifeq ($(findstring hppa, $(TARGET_BASE_ARCH) $(ARCH)),hppa) | 209 | ifeq ($(findstring hppa, $(TARGET_BASE_ARCH) $(ARCH)),hppa) |
211 | -LIBOBJS+=hppa-dis.o | 210 | +libobj-y += hppa-dis.o |
212 | endif | 211 | endif |
213 | ifeq ($(findstring s390, $(TARGET_ARCH) $(ARCH)),s390) | 212 | ifeq ($(findstring s390, $(TARGET_ARCH) $(ARCH)),s390) |
214 | -LIBOBJS+=s390-dis.o | 213 | +libobj-y += s390-dis.o |
215 | endif | 214 | endif |
216 | 215 | ||
217 | # libqemu | 216 | # libqemu |
218 | 217 | ||
219 | -libqemu.a: $(LIBOBJS) | 218 | +libqemu.a: $(libobj-y) |
220 | 219 | ||
221 | translate.o: translate.c cpu.h | 220 | translate.o: translate.c cpu.h |
222 | 221 |