diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-20 17:36:35 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-01-12 18:42:51 +0100 |
| commit | bf0842b71f581e0c60f4bbfbebf37ff999a22b88 (patch) | |
| tree | ac034f368eff6242ed718091add13ed5a79daaf8 /rules.mak | |
| parent | 576d55068d210c7316297af4194a10f729efe742 (diff) | |
| download | qemu-bf0842b71f581e0c60f4bbfbebf37ff999a22b88.tar.gz qemu-bf0842b71f581e0c60f4bbfbebf37ff999a22b88.tar.bz2 qemu-bf0842b71f581e0c60f4bbfbebf37ff999a22b88.zip | |
build: move version-obj-y to the generic LINK rule
There is no reason for it to be in block-obj-y, in particular.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'rules.mak')
| -rw-r--r-- | rules.mak | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -23,7 +23,7 @@ QEMU_CFLAGS += -I$(<D) -I$(@D) ifeq ($(LIBTOOL),) LIBTOOL = /bin/false LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \ - $(sort $(filter %.o, $1)) $(filter-out %.o, $1) \ + $(sort $(filter %.o, $1)) $(filter-out %.o, $1) $(version-obj-y) \ $(LIBS)," LINK $(TARGET_DIR)$@") else LIBTOOL += $(if $(V),,--quiet) @@ -35,7 +35,7 @@ LIBTOOL += $(if $(V),,--quiet) LINK = $(call quiet-command,\ $(if $(filter %.lo %.la,$^),$(LIBTOOL) --mode=link --tag=CC \ )$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \ - $(sort $(filter %.o, $1)) $(filter-out %.o, $1) \ + $(sort $(filter %.o, $1)) $(filter-out %.o, $1) $(version-obj-y) \ $(LIBS),$(if $(filter %.lo %.la,$^),"lt LINK ", " LINK ")"$(TARGET_DIR)$@") endif |