diff mbox

[7/9] build: use nesting magic for tools-obj-y

Message ID 1347900303-24314-8-git-send-email-pbonzini@redhat.com
State New
Headers show

Commit Message

Paolo Bonzini Sept. 17, 2012, 4:45 p.m. UTC 
Move this variable to Makefile.objs, together with all the other lists
of object files.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 Makefile      | 5 -----
 Makefile.objs | 9 +++++++++
 2 file modificati, 9 inserzioni(+), 5 rimozioni(-)
diff mbox

Patch

diff --git a/Makefile b/Makefile
index fffbbb8..a8078ec 100644
--- a/Makefile
+++ b/Makefile
@@ -152,11 +152,6 @@  endif
 
 qemu-img.o: qemu-img-cmds.h
 
-tools-obj-y = $(oslib-obj-y) $(trace-obj-y) qemu-tool.o qemu-timer.o \
-	qemu-timer-common.o main-loop.o notify.o monitor-dummy.o \
-	iohandler.o
-tools-obj-$(CONFIG_POSIX) += compatfd.o
-
 qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y)
 qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) $(block-obj-y)
 qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y)
diff --git a/Makefile.objs b/Makefile.objs
index cf00fd5..85bd70b 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -226,6 +226,14 @@  common-obj-y += qmp.o hmp.o
 universal-obj-y += $(qapi-obj-y)
 
 ######################################################################
+# tools-obj-y is shared by qemu-img, qemu-io, qemu-nbd
+
+tools-obj-y = $(oslib-obj-y) $(trace-obj-y) qemu-tool.o qemu-timer.o
+tools-obj-y += qemu-timer-common.o main-loop.o notify.o monitor-dummy.o
+tools-obj-y += iohandler.o
+tools-obj-$(CONFIG_POSIX) += compatfd.o
+
+######################################################################
 # guest agent
 
 qga-obj-y = qga/ qemu-ga.o module.o monitor-dummy.o
@@ -246,5 +254,6 @@  nested-vars += \
 	qapi-obj-y \
 	user-obj-y \
 	common-obj-y \
+	tools-obj-y \
 	extra-obj-y
 dummy := $(call unnest-vars)