Commit bf0842b7 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 576d5506
...@@ -206,7 +206,7 @@ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) ...@@ -206,7 +206,7 @@ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h) QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)
$(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
qemu-ga$(EXESUF): $(qga-obj-y) $(trace-obj-y) $(version-obj-y) libqemuutil.a libqemustub.a qemu-ga$(EXESUF): $(qga-obj-y) $(trace-obj-y) libqemuutil.a libqemustub.a
$(call LINK, $^) $(call LINK, $^)
clean: clean:
......
...@@ -25,7 +25,7 @@ coroutine-obj-$(CONFIG_WIN32) += coroutine-win32.o ...@@ -25,7 +25,7 @@ coroutine-obj-$(CONFIG_WIN32) += coroutine-win32.o
block-obj-y = async.o thread-pool.o block-obj-y = async.o thread-pool.o
block-obj-y += nbd.o block.o blockjob.o block-obj-y += nbd.o block.o blockjob.o
block-obj-y += $(coroutine-obj-y) $(version-obj-y) block-obj-y += $(coroutine-obj-y)
block-obj-y += main-loop.o iohandler.o qemu-timer.o block-obj-y += main-loop.o iohandler.o qemu-timer.o
block-obj-$(CONFIG_POSIX) += aio-posix.o block-obj-$(CONFIG_POSIX) += aio-posix.o
block-obj-$(CONFIG_WIN32) += aio-win32.o block-obj-$(CONFIG_WIN32) += aio-win32.o
...@@ -58,7 +58,6 @@ common-obj-y += block-migration.o ...@@ -58,7 +58,6 @@ common-obj-y += block-migration.o
common-obj-y += page_cache.o common-obj-y += page_cache.o
common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o
common-obj-$(CONFIG_WIN32) += version.o
common-obj-$(CONFIG_SPICE) += spice-qemu-char.o common-obj-$(CONFIG_SPICE) += spice-qemu-char.o
......
...@@ -23,7 +23,7 @@ QEMU_CFLAGS += -I$(<D) -I$(@D) ...@@ -23,7 +23,7 @@ QEMU_CFLAGS += -I$(<D) -I$(@D)
ifeq ($(LIBTOOL),) ifeq ($(LIBTOOL),)
LIBTOOL = /bin/false LIBTOOL = /bin/false
LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \ 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)$@") $(LIBS)," LINK $(TARGET_DIR)$@")
else else
LIBTOOL += $(if $(V),,--quiet) LIBTOOL += $(if $(V),,--quiet)
...@@ -35,7 +35,7 @@ LIBTOOL += $(if $(V),,--quiet) ...@@ -35,7 +35,7 @@ LIBTOOL += $(if $(V),,--quiet)
LINK = $(call quiet-command,\ LINK = $(call quiet-command,\
$(if $(filter %.lo %.la,$^),$(LIBTOOL) --mode=link --tag=CC \ $(if $(filter %.lo %.la,$^),$(LIBTOOL) --mode=link --tag=CC \
)$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \ )$(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)$@") $(LIBS),$(if $(filter %.lo %.la,$^),"lt LINK ", " LINK ")"$(TARGET_DIR)$@")
endif endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment