Commit 3aa892d75f38c339a1d7e09126e84f06b05b4232
1 parent
17759187
Consolidate linker rules (Avi Kivity)
Use generic rules where posssible, and a LINK macro where not. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6379 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
3 changed files
with
12 additions
and
6 deletions
Makefile
| @@ -188,10 +188,10 @@ libqemu_user.a: $(USER_OBJS) | @@ -188,10 +188,10 @@ libqemu_user.a: $(USER_OBJS) | ||
| 188 | ###################################################################### | 188 | ###################################################################### |
| 189 | 189 | ||
| 190 | qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS) | 190 | qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS) |
| 191 | - $(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS) | ||
| 192 | 191 | ||
| 193 | qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o osdep.o $(BLOCK_OBJS) | 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 | clean: | 196 | clean: |
| 197 | # avoid old build problems by removing potentially incorrect old files | 197 | # avoid old build problems by removing potentially incorrect old files |
Makefile.target
| @@ -355,7 +355,7 @@ OBJS+= libqemu.a | @@ -355,7 +355,7 @@ OBJS+= libqemu.a | ||
| 355 | signal.o: CFLAGS += $(HELPER_CFLAGS) | 355 | signal.o: CFLAGS += $(HELPER_CFLAGS) |
| 356 | 356 | ||
| 357 | $(QEMU_PROG): $(OBJS) ../libqemu_user.a | 357 | $(QEMU_PROG): $(OBJS) ../libqemu_user.a |
| 358 | - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) | 358 | + $(LINK) |
| 359 | ifeq ($(ARCH),alpha) | 359 | ifeq ($(ARCH),alpha) |
| 360 | # Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of | 360 | # Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of |
| 361 | # the address space (31 bit so sign extending doesn't matter) | 361 | # the address space (31 bit so sign extending doesn't matter) |
| @@ -390,7 +390,7 @@ endif | @@ -390,7 +390,7 @@ endif | ||
| 390 | signal.o: CFLAGS += $(HELPER_CFLAGS) | 390 | signal.o: CFLAGS += $(HELPER_CFLAGS) |
| 391 | 391 | ||
| 392 | $(QEMU_PROG): $(OBJS) | 392 | $(QEMU_PROG): $(OBJS) |
| 393 | - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) | 393 | + $(LINK) |
| 394 | 394 | ||
| 395 | endif #CONFIG_DARWIN_USER | 395 | endif #CONFIG_DARWIN_USER |
| 396 | 396 | ||
| @@ -494,7 +494,7 @@ endif | @@ -494,7 +494,7 @@ endif | ||
| 494 | signal.o: CFLAGS += $(HELPER_CFLAGS) | 494 | signal.o: CFLAGS += $(HELPER_CFLAGS) |
| 495 | 495 | ||
| 496 | $(QEMU_PROG): $(OBJS) ../libqemu_user.a | 496 | $(QEMU_PROG): $(OBJS) ../libqemu_user.a |
| 497 | - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) | 497 | + $(LINK) |
| 498 | 498 | ||
| 499 | endif #CONFIG_BSD_USER | 499 | endif #CONFIG_BSD_USER |
| 500 | 500 | ||
| @@ -719,8 +719,10 @@ LDFLAGS+=-p | @@ -719,8 +719,10 @@ LDFLAGS+=-p | ||
| 719 | main.o: CFLAGS+=-p | 719 | main.o: CFLAGS+=-p |
| 720 | endif | 720 | endif |
| 721 | 721 | ||
| 722 | +$(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) | ||
| 723 | + | ||
| 722 | $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a | 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 | endif # !CONFIG_USER_ONLY | 727 | endif # !CONFIG_USER_ONLY |
| 726 | 728 |