From nobody Thu May 2 01:58:31 2024 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 1550229078435702.0445873436068; Fri, 15 Feb 2019 03:11:18 -0800 (PST) Received: from localhost ([127.0.0.1]:37203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gubOl-0006Er-AS for importer@patchew.org; Fri, 15 Feb 2019 06:11:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gubGX-0007eP-Iz for qemu-devel@nongnu.org; Fri, 15 Feb 2019 06:02:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gub3h-0004bB-SJ for qemu-devel@nongnu.org; Fri, 15 Feb 2019 05:49:32 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:41915) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gub3Z-00043J-9z for qemu-devel@nongnu.org; Fri, 15 Feb 2019 05:49:23 -0500 Received: by mail-wr1-x442.google.com with SMTP id x10so9806819wrs.8 for ; Fri, 15 Feb 2019 02:49:21 -0800 (PST) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id w3sm2788206wrl.22.2019.02.15.02.49.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 02:49:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=SByA9NcQiiMOV1jlgp//INoMa6k8KSDgGsMM5imXAdo=; b=kzmxyrP8tNtKYBJoGQfN8lzG5mE5CXZ4y0vgWs+iziIn73P4nPfu9Lr7C1XQE0LqqC IKyCWyXi92SbSZqnxIZ/ufwL6c1WybUf8DOmaoYYAmB8GUsYtwBbxq5sWvRBtmgJZgXX dtj7Uzek8sjknpmeRkhMowj9KcZGFEF3d1K9sE6nkRP54/c5koq1KV9X4sKuI3aUy0eP /h67R/HOUi8o9j7yFua6PlAYHhrx7ccZPg/LTfAK8JTu3Mqax/VcapQ4Zmnukpie4t3k rL8mJozecayqFosLQ6GmGAxlOBKUygw1PrnljwMVfLHY9/A/1XwfCS+BgOH5roXOpUSv u0EQ== 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:cc:subject:date:message-id; bh=SByA9NcQiiMOV1jlgp//INoMa6k8KSDgGsMM5imXAdo=; b=lw0hUDBCIwBhhyEFKriT/WtTIp1Kdhz7ke1G5CtoJKWsDCl5Zt6oeO3wSnH19q1Zwy tioQgER7Om41MtMRs8Nzyvi9DU89nv/bRmoiAHxoLNd/7DiKYTBEws6r5N8/Ma/FVmiN e/MU5+gkz6EyzBFM3PTRVAULxjy0C6w1gMNR3F5sTwMEWrhxDCu8K9HP3sW5Il36N0aO HQgMXMlMI8fmJHTH+07bme8SvR4mE+fJTtC2QMwJLwjDOsv0zkxRDqK1Y27bcP+aew5Q fwl+Cq7xNxRUckadACuxH5jDLar6utgAn++ROE89xJnGlCfuD9SpNGh0VaD+MJZJGf7Y R48g== X-Gm-Message-State: AHQUAuZIKsNhyVE3//fn62MBx+t1OsHnUe6fzc2CWnPSZht6iIMwT3uY /LfK+3uPAtVwyf/zqHRzc7pgUKHq X-Google-Smtp-Source: AHgI3IaOvMjfM24KN/RuH9GUzpGwMaJYtpwYlmPjRNOgMejJjE5FCZJ66y9OMguQpq5SurKxEwL7sw== X-Received: by 2002:adf:d4c6:: with SMTP id w6mr1037299wrk.65.1550227759482; Fri, 15 Feb 2019 02:49:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 15 Feb 2019 11:49:15 +0100 Message-Id: <1550227757-10869-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH] 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: , Cc: armbru@redhat.com, stefanha@redhat.com 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 Acked-by: Stefan Hajnoczi Reviewed-by.) Reviewed-by: Markus Armbruster --- 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 b7aae33..c3a2354 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -112,7 +112,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 bb82959..a56a72f 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 @@ -172,14 +174,11 @@ 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 slirp-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,.., \ block-obj-y \ block-obj-m \ @@ -191,9 +190,7 @@ dummy :=3D $(call unnest-vars,.., \ common-obj-y \ common-obj-m \ slirp-obj-y) -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 $(block-obj-y) $(chardev-obj-y) all-obj-$(CONFIG_USER_ONLY) +=3D $(crypto-aes-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