From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wirxf-0006Ij-HW for qemu-devel@nongnu.org; Fri, 09 May 2014 17:04:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WirxU-0005bX-Vx for qemu-devel@nongnu.org; Fri, 09 May 2014 17:04:07 -0400 Received: from mail-ee0-x231.google.com ([2a00:1450:4013:c00::231]:52934) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WirxU-0005bS-Ol for qemu-devel@nongnu.org; Fri, 09 May 2014 17:03:56 -0400 Received: by mail-ee0-f49.google.com with SMTP id e53so2964500eek.22 for ; Fri, 09 May 2014 14:03:55 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 9 May 2014 23:03:37 +0200 Message-Id: <1399669424-29676-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1399669424-29676-1-git-send-email-pbonzini@redhat.com> References: <1399669424-29676-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 03/10] build: simplify Makefile.target around unnest-vars invocations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mjt@tls.msk.ru No need to save/restore obj-y, we can just build all-obj-y incrementally. Reviewed-by: Fam Zheng Signed-off-by: Paolo Bonzini --- 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