[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/24] use nested Makefile rules for qom/ objects
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 09/24] use nested Makefile rules for qom/ objects |
Date: |
Sun, 3 Jun 2012 14:25:43 +0200 |
qom/ already used a separate makefile. Convert it to use relative
paths, and make it declare both common-obj-y and user-obj-y. This
way, the upper makefiles do not need to know that some QOM files
are compiled twice.
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile.objs | 13 +++++++------
qom/Makefile | 6 ++++--
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index 2eed180..d823968 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -12,9 +12,7 @@ universal-obj-y += $(qobject-obj-y)
#######################################################################
# QOM
-include $(SRC_PATH)/qom/Makefile
-qom-obj-y = $(addprefix qom/, $(qom-y))
-qom-obj-twice-y = $(addprefix qom/, $(qom-twice-y))
+qom-obj-y = qom/
universal-obj-y += $(qom-obj-y)
@@ -94,7 +92,7 @@ fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/,
$(fsdev-nested-y))
common-obj-y = $(block-obj-y) blockdev.o
common-obj-y += $(net-obj-y)
-common-obj-y += $(qom-obj-twice-y)
+common-obj-y += qom/
common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX))
common-obj-y += readline.o console.o cursor.o
common-obj-y += $(oslib-obj-y)
@@ -202,7 +200,7 @@ user-obj-y += cutils.o cache-utils.o
user-obj-y += module.o
user-obj-y += qemu-user.o
user-obj-y += $(trace-obj-y)
-user-obj-y += $(qom-obj-twice-y)
+user-obj-y += qom/
######################################################################
# libhw
@@ -468,5 +466,8 @@ vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)
QEMU_CFLAGS+=$(GLIB_CFLAGS)
-nested-vars += # ...
+nested-vars += \
+ qom-obj-y \
+ user-obj-y \
+ common-obj-y
dummy := $(foreach var, $(nested-vars), $(call unnest-var,$(var)))
diff --git a/qom/Makefile b/qom/Makefile
index 34c6de5..5ef060a 100644
--- a/qom/Makefile
+++ b/qom/Makefile
@@ -1,2 +1,4 @@
-qom-y = object.o container.o qom-qobject.o
-qom-twice-y = cpu.o
+qom-obj-y = object.o container.o qom-qobject.o
+qom-obj-twice-y = cpu.o
+common-obj-y = $(qom-obj-twice-y)
+user-obj-y = $(qom-obj-twice-y)
--
1.7.10.1
- [Qemu-devel] [PATCH 01/24] remove trace-nested-y, (continued)
- [Qemu-devel] [PATCH 01/24] remove trace-nested-y, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 03/24] add rules for nesting, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 02/24] do not sprinkle around GENERATED_HEADERS dependencies, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 04/24] move *-user/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 06/24] move libobj-y variable to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 05/24] move obj-TARGET-y variables to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 07/24] move other target-*/ objects to nested Makefiles, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 08/24] move rules for nesting to Makefile.objs, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 09/24] use nested Makefile rules for qom/ objects,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 10/24] move block/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 12/24] move fsdev/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 11/24] move net/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 13/24] move ui/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 14/24] move audio/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 15/24] move slirp/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 18/24] move target-independent hw/ objects to nested Makefiles, Paolo Bonzini, 2012/06/03