Revision 3aa892d7

b/Makefile
188 188
######################################################################
189 189

  
190 190
qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS)
191
	$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
192 191

  
193 192
qemu-nbd$(EXESUF):  qemu-nbd.o qemu-tool.o osdep.o $(BLOCK_OBJS)
194
	$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
193

  
194
qemu-img$(EXESUF) qemu-nbd$(EXESUF): LIBS += -lz
195 195

  
196 196
clean:
197 197
# avoid old build problems by removing potentially incorrect old files
b/Makefile.target
355 355
signal.o: CFLAGS += $(HELPER_CFLAGS)
356 356

  
357 357
$(QEMU_PROG): $(OBJS) ../libqemu_user.a
358
	$(CC) $(LDFLAGS) -o $@ $^  $(LIBS)
358
	$(LINK)
359 359
ifeq ($(ARCH),alpha)
360 360
# Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of
361 361
# the address space (31 bit so sign extending doesn't matter)
......
390 390
signal.o: CFLAGS += $(HELPER_CFLAGS)
391 391

  
392 392
$(QEMU_PROG): $(OBJS)
393
	$(CC) $(LDFLAGS) -o $@ $^  $(LIBS)
393
	$(LINK)
394 394

  
395 395
endif #CONFIG_DARWIN_USER
396 396

  
......
494 494
signal.o: CFLAGS += $(HELPER_CFLAGS)
495 495

  
496 496
$(QEMU_PROG): $(OBJS) ../libqemu_user.a
497
	$(CC) $(LDFLAGS) -o $@ $^  $(LIBS)
497
	$(LINK)
498 498

  
499 499
endif #CONFIG_BSD_USER
500 500

  
......
719 719
main.o: CFLAGS+=-p
720 720
endif
721 721

  
722
$(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS)
723

  
722 724
$(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a
723
	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS)
725
	$(LINK)
724 726

  
725 727
endif # !CONFIG_USER_ONLY
726 728

  
b/rules.mak
8 8
%.o: %.m
9 9
	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
10 10

  
11
LINK = $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
12

  
13
%$(EXESUF): %.o
14
	$(LINK)

Also available in: Unified diff