From nobody Mon Feb 9 10:11:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552324992998824.8231075067429; Mon, 11 Mar 2019 10:23:12 -0700 (PDT) Received: from localhost ([127.0.0.1]:37205 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3Odp-0004Y3-Id for importer@patchew.org; Mon, 11 Mar 2019 13:23:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60752) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3ODY-00074e-ST for qemu-devel@nongnu.org; Mon, 11 Mar 2019 12:56:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3ODW-00033O-Bo for qemu-devel@nongnu.org; Mon, 11 Mar 2019 12:56:00 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:54941) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3ODU-0002zn-DG for qemu-devel@nongnu.org; Mon, 11 Mar 2019 12:55:57 -0400 Received: by mail-wm1-x333.google.com with SMTP id f3so5367066wmj.4 for ; Mon, 11 Mar 2019 09:55:56 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id e12sm6484836wrs.91.2019.03.11.09.55.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Mar 2019 09:55:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=jFDEogMG2G9oz3LylDbDQT4FsF6rosmiU7KQy1L/n+c=; b=nyKe4hp9q7PspIr30hLq4TQEJgPstnfWXJA/XnCCJ4ECok3A4wkyZCoP0svkZgdPWH 1NfIdGB95IPBGXLd82/qqSR/LHGJV2oxDf3+mfh1F7Ge82b8s+QrZgZVQlQielXwyyfw V+r9FIV5wanZ1P4iNeC5TWj+VcgGpfBtcXO1TUbgHL0R4Zw8Nbkco81aumdeA2VgMvmF R/FmROxOJcS0kHZOrXdh5NfDFwm+B20QYJQ52q3LjgitLgfi6zvwZ/SDgHKi6RmI23Tr Z1NFzIpLOnGPgbUjzkt7Hf/isEjR1MChW6NmsHqO0MBj4O2DXDDgy55GcYZRmKAeEzwV qlZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=jFDEogMG2G9oz3LylDbDQT4FsF6rosmiU7KQy1L/n+c=; b=FQQkpQG6gsshN+EiCiVR7afwtynT/4F3cDDumKNjCdWUaQTRk2kRk9a2ZF2cDVkzXw 6y7dTcd9QrboMGNjA1y7cKrwSCqUUZdcOso0eMyOEIEnmLrBNhz+LixvglxN962FYkr8 aV3v2cl4eNYSmwtbYP/a1gNBojCa+/QeebbZpPCI9ECK/Ztk6VDv1cwoDs4iwAcpdprD v86Hu/w/HtKarUQuXcY2WabJuCDyc/PGIspTZA1zd0GacsCZCSafWkQOohko9Ikabjbq hW88HDti88U5nh5Ewkw8tC1OSzk4TKVhqcJdx0hmOiWkrVZ+JoKOXEjHZ1x27RXuV80s soIA== X-Gm-Message-State: APjAAAW45GWNBacH2nykxZgo5rVMuKTF/grdrJhcKtRSGjhsfhLyK67Q puFToBjNw9IhKK/CW50sXDzH3STn X-Google-Smtp-Source: APXvYqymvOYKa/qNcF61hxFPaUqtyQaa3OX71/aZuA0+ypMf/VZf0Zfb2FtY+SQS5EWLGFKeBMHVBg== X-Received: by 2002:a1c:1d15:: with SMTP id d21mr15832wmd.132.1552323354966; Mon, 11 Mar 2019 09:55:54 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 17:55:19 +0100 Message-Id: <1552323335-46779-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1552323335-46779-1-git-send-email-pbonzini@redhat.com> References: <1552323335-46779-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 Subject: [Qemu-devel] [PULL v2 15/31] build: get rid of target-obj-y X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It is possible to specify the trace/ directory already in objs-y; there is no need to have a separate unnest-vars invocation. Signed-off-by: Paolo Bonzini --- Makefile.objs | 1 - Makefile.target | 7 ++----- trace/Makefile.objs | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index ef65a6c..acc53aa 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -101,7 +101,6 @@ version-obj-$(CONFIG_WIN32) +=3D $(BUILD_DIR)/version.o ###################################################################### # tracing util-obj-y +=3D trace/ -target-obj-y +=3D trace/ =20 ###################################################################### # guest agent diff --git a/Makefile.target b/Makefile.target index 40830c5..a458506 100644 --- a/Makefile.target +++ b/Makefile.target @@ -105,6 +105,8 @@ all: $(PROGS) stap # Dummy command so that make thinks it has done something @true =20 +obj-y +=3D trace/ + ######################################################### # cpu emulator library obj-y +=3D exec.o @@ -173,13 +175,10 @@ endif # CONFIG_SOFTMMU dummy :=3D $(call unnest-vars,,obj-y) all-obj-y :=3D $(obj-y) =20 -target-obj-y :=3D block-obj-y :=3D common-obj-y :=3D chardev-obj-y :=3D include $(SRC_PATH)/Makefile.objs -dummy :=3D $(call unnest-vars,,target-obj-y) -target-obj-y-save :=3D $(target-obj-y) dummy :=3D $(call unnest-vars,.., \ authz-obj-y \ block-obj-y \ @@ -191,9 +190,7 @@ dummy :=3D $(call unnest-vars,.., \ io-obj-y \ common-obj-y \ common-obj-m) -target-obj-y :=3D $(target-obj-y-save) all-obj-y +=3D $(common-obj-y) -all-obj-y +=3D $(target-obj-y) all-obj-y +=3D $(qom-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(authz-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(block-obj-y) $(chardev-obj-y) diff --git a/trace/Makefile.objs b/trace/Makefile.objs index afd571c..c544509 100644 --- a/trace/Makefile.objs +++ b/trace/Makefile.objs @@ -36,7 +36,7 @@ $(obj)/generated-helpers.c-timestamp: $(SRC_PATH)/trace-e= vents $(BUILD_DIR)/conf =20 $(obj)/generated-helpers.o: $(obj)/generated-helpers.c =20 -target-obj-y +=3D generated-helpers.o +obj-y +=3D generated-helpers.o =20 =20 $(obj)/generated-tcg-tracers.h: $(obj)/generated-tcg-tracers.h-timestamp @@ -55,5 +55,5 @@ $(obj)/generated-tcg-tracers.h-timestamp: $(SRC_PATH)/tra= ce-events $(BUILD_DIR)/ util-obj-$(CONFIG_TRACE_SIMPLE) +=3D simple.o util-obj-$(CONFIG_TRACE_FTRACE) +=3D ftrace.o util-obj-y +=3D control.o -target-obj-y +=3D control-target.o +obj-y +=3D control-target.o util-obj-y +=3D qmp.o --=20 1.8.3.1