From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tu50v-0003Gt-FF for qemu-devel@nongnu.org; Sat, 12 Jan 2013 12:37:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tu50q-0000V8-C0 for qemu-devel@nongnu.org; Sat, 12 Jan 2013 12:37:01 -0500 Received: from mail-wi0-f176.google.com ([209.85.212.176]:60518) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tu50q-0000Uw-4h for qemu-devel@nongnu.org; Sat, 12 Jan 2013 12:36:56 -0500 Received: by mail-wi0-f176.google.com with SMTP id hm6so458677wib.15 for ; Sat, 12 Jan 2013 09:36:55 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Sat, 12 Jan 2013 18:35:34 +0100 Message-Id: <1358012138-21613-24-git-send-email-pbonzini@redhat.com> In-Reply-To: <1358012138-21613-1-git-send-email-pbonzini@redhat.com> References: <1358012138-21613-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 23/27] build: move version-obj-y to the generic LINK rule List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org There is no reason for it to be in block-obj-y, in particular. We would like to put it in a library, but nothing would pull it in. So add it to the LINK rule, and use a Makefile dependency to ensure it is built. Signed-off-by: Paolo Bonzini --- Makefile | 3 ++- Makefile.objs | 3 +-- rules.mak | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 8c3b13e..e92ce1f 100644 --- a/Makefile +++ b/Makefile @@ -153,6 +153,7 @@ version.o: $(SRC_PATH)/version.rc config-host.h $(call quiet-command,$(WINDRES) -I. -o $@ $<," RC $(TARGET_DIR)$@") version-obj-$(CONFIG_WIN32) += version.o +Makefile: $(version-obj-y) ###################################################################### # Build libraries @@ -206,7 +207,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) $(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, $^) clean: diff --git a/Makefile.objs b/Makefile.objs index eed27df..aae2696 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -25,7 +25,7 @@ coroutine-obj-$(CONFIG_WIN32) += coroutine-win32.o block-obj-y = async.o thread-pool.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-$(CONFIG_POSIX) += aio-posix.o block-obj-$(CONFIG_WIN32) += aio-win32.o @@ -58,7 +58,6 @@ common-obj-y += block-migration.o common-obj-y += page_cache.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 diff --git a/rules.mak b/rules.mak index 4297345..6d82c0d 100644 --- a/rules.mak +++ b/rules.mak @@ -23,7 +23,7 @@ QEMU_CFLAGS += -I$(