[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/10] build: simplify Makefile.target around unnest-
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 03/10] build: simplify Makefile.target around unnest-vars invocations |
Date: |
Fri, 9 May 2014 23:03:37 +0200 |
No need to save/restore obj-y, we can just build all-obj-y incrementally.
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile.target | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 2726b74..261de9e 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -143,10 +143,7 @@ endif # CONFIG_SOFTMMU
%/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
dummy := $(call unnest-vars,,obj-y)
-
-# we are making another call to unnest-vars with different vars, protect obj-y,
-# it can be overriden in subdir Makefile.objs
-obj-y-save := $(obj-y)
+all-obj-y := $(obj-y)
block-obj-y :=
common-obj-y :=
@@ -156,11 +153,7 @@ dummy := $(call unnest-vars,.., \
block-obj-m \
common-obj-y \
common-obj-m)
-
-# Now restore obj-y
-obj-y := $(obj-y-save)
-
-all-obj-y = $(obj-y) $(common-obj-y)
+all-obj-y += $(common-obj-y)
all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)
ifndef CONFIG_HAIKU
--
1.8.3.1
- [Qemu-devel] [PULL 00/10] Build system changes for 2014-05-09, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 02/10] build: simplify Makefile.target a bit, use just one rule for softmmu, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 01/10] build: Fix per-object variables for Makefile.target, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 04/10] Makefile: strip tools and modules too, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 05/10] Makefile.target: use $(INSTALL_PROG) for installing, not $(INSTALL), Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 06/10] Makefile: use $(INSTALL_LIB) for modules not $(INSTALL_PROG), Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 07/10] build: add support for per-object -cflags and -libs to all rules, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 03/10] build: simplify Makefile.target around unnest-vars invocations,
Paolo Bonzini <=
- [Qemu-devel] [PULL 08/10] build: convert some obj-specific CFLAGS to use new foo.o-cflags syntax, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 10/10] libcacard: remove libcacard-specific CFLAGS and LIBS from global vars, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 09/10] build: simplify and fix fix-obj-vars, Paolo Bonzini, 2014/05/09
- Re: [Qemu-devel] [PULL 00/10] Build system changes for 2014-05-09, Peter Maydell, 2014/05/13