Revision 0bfe3ca5 Makefile.target

b/Makefile.target
340 340
OBJS+= m68k-sim.o m68k-semi.o
341 341
endif
342 342

  
343
OBJS+= libqemu.a
344

  
345 343
# Note: this is a workaround. The real fix is to avoid compiling
346 344
# cpu_signal_handler() in cpu-exec.c.
347 345
signal.o: CFLAGS += $(HELPER_CFLAGS)
348 346

  
349
$(QEMU_PROG): $(OBJS) ../libqemu_user.a
350
	$(LINK)
347
$(QEMU_PROG): ARLIBS=../libqemu_user.a libqemu.a
348
$(QEMU_PROG): $(OBJS) ../libqemu_user.a libqemu.a
349
	$(call LINK,$(OBJS))
351 350
ifeq ($(ARCH),alpha)
352 351
# Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of
353 352
# the address space (31 bit so sign extending doesn't matter)
......
372 371
OBJS= main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \
373 372
      gdbstub.o gdbstub-xml.o
374 373

  
375
OBJS+= libqemu.a
376

  
377 374
# Note: this is a workaround. The real fix is to avoid compiling
378 375
# cpu_signal_handler() in cpu-exec.c.
379 376
signal.o: CFLAGS += $(HELPER_CFLAGS)
380 377

  
381
$(QEMU_PROG): $(OBJS)
382
	$(LINK)
378
$(QEMU_PROG): ARLIBS=libqemu.a
379
$(QEMU_PROG): $(OBJS) libqemu.a
380
	$(call LINK,$(OBJS))
383 381

  
384 382
endif #CONFIG_DARWIN_USER
385 383

  
......
473 471
      gdbstub.o gdbstub-xml.o
474 472
OBJS+= uaccess.o
475 473

  
476
OBJS+= libqemu.a
477

  
478 474
# Note: this is a workaround. The real fix is to avoid compiling
479 475
# cpu_signal_handler() in cpu-exec.c.
480 476
signal.o: CFLAGS += $(HELPER_CFLAGS)
481 477

  
482
$(QEMU_PROG): $(OBJS) ../libqemu_user.a
483
	$(LINK)
478
$(QEMU_PROG): ARLIBS=libqemu.a ../libqemu_user.a
479
$(QEMU_PROG): $(OBJS) libqemu.a ../libqemu_user.a
480
	$(call LINK,$(OBJS))
484 481

  
485 482
endif #CONFIG_BSD_USER
486 483

  
......
716 713
vl.o: qemu-options.h
717 714

  
718 715
$(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS)
719

  
716
$(QEMU_PROG): ARLIBS=../libqemu_common.a libqemu.a
720 717
$(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a
721
	$(LINK)
718
	$(call LINK,$(OBJS))
722 719

  
723 720
endif # !CONFIG_USER_ONLY
724 721

  

Also available in: Unified diff