From patchwork Sat Mar 9 07:48:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1053805 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Xasfcqzf"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Gc6m5wYDz9s3q for ; Sat, 9 Mar 2019 18:53:04 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55311 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Wn0-0006fn-Mb for incoming@patchwork.ozlabs.org; Sat, 09 Mar 2019 02:53:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Wih-0003tJ-Dy for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2Wig-0000X1-Fd for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:35 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:34764) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h2Wig-0000V3-5c for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:34 -0500 Received: by mail-wm1-x331.google.com with SMTP id o10so10308183wmc.1 for ; Fri, 08 Mar 2019 23:48:33 -0800 (PST) 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=XasfcqzfAnfJ/VTSOj1UVAS0RQHiS7jXv22yA5H5PxqTTEvPaKI8thl9dn77F33v2F LqZlSftEch+SXyzNIv0iH3ucZPeIS4b5B0XKVmKW41Ay+34y4q+hKVZzVwR4jr26hgE1 wjh3D3Fh3MdjhVBVft0m1+/NNJAoiq9V6VDUPejn8lQl1jvv1ujslPIAST0KttK2DyTI of7drS/BJSToWh7C+3boBA5lUKUi3J3xE5kr58txuB/Ui6IHxusItx9jk/y6zmOc69sp 4Z8fZUd/Ka1te91/fAg2qpDJv8/OBMR2r2H0HhYIXXinGXzXuYELPJvvf6EagqEG9xUj 7L9w== 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=NW48YvSH1tifLibQ3jeGus3bIGDEAVWbK1bBJ5a/D/g6x6UrhbM4GQXw5MaTccThOq 7TbE6ucMjuW5sKcWrI+4GlWWqqxMmkRzvZoiiiuBAMMCILnf+l52U46+C6F4caHJKGOz 5TJ3iZPMJ3zJyvU23isWGrN6Q27hbTcKNXHxbetJ/e/XMvus+AFUSE99JlNDeUT6nyeq 2W4JrVohT29SOIyfl1TSkTerV6fHzPZczikofmfC2vChwaDUWCsFwiu7On4uXQEvAqux S6U4qE/Suv6YQWX2tNvDQ1WM2J4EuLlJlNMt3qt27FzngFd/jo1O85rwEf2wo/nHPch3 AK+g== X-Gm-Message-State: APjAAAUHZUTDwEARtE3p+6CpsU7DhPyv90/S2HJBXnocvWiySDmCScL6 FQ4vhZckvOi5FlFJZyyjwJ2J4NUk X-Google-Smtp-Source: APXvYqwY8odkcWvPwK66QSOcIjZicGC+D8Og91iz4ymM96nR50Abw7loWOT079wZqk795lbV+f5DCw== X-Received: by 2002:a1c:eb14:: with SMTP id j20mr12004218wmh.32.1552117712096; Fri, 08 Mar 2019 23:48:32 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 11sm5252294wmg.27.2019.03.08.23.48.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 23:48:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 9 Mar 2019 08:48:06 +0100 Message-Id: <1552117698-12355-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1552117698-12355-1-git-send-email-pbonzini@redhat.com> References: <1552117698-12355-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::331 Subject: [Qemu-devel] [PULL 13/25] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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) += $(BUILD_DIR)/version.o ###################################################################### # tracing util-obj-y += trace/ -target-obj-y += trace/ ###################################################################### # 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 +obj-y += trace/ + ######################################################### # cpu emulator library obj-y += exec.o @@ -173,13 +175,10 @@ endif # CONFIG_SOFTMMU dummy := $(call unnest-vars,,obj-y) all-obj-y := $(obj-y) -target-obj-y := block-obj-y := common-obj-y := chardev-obj-y := include $(SRC_PATH)/Makefile.objs -dummy := $(call unnest-vars,,target-obj-y) -target-obj-y-save := $(target-obj-y) dummy := $(call unnest-vars,.., \ authz-obj-y \ block-obj-y \ @@ -191,9 +190,7 @@ dummy := $(call unnest-vars,.., \ io-obj-y \ common-obj-y \ common-obj-m) -target-obj-y := $(target-obj-y-save) all-obj-y += $(common-obj-y) -all-obj-y += $(target-obj-y) all-obj-y += $(qom-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(authz-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(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-events $(BUILD_DIR)/conf $(obj)/generated-helpers.o: $(obj)/generated-helpers.c -target-obj-y += generated-helpers.o +obj-y += generated-helpers.o $(obj)/generated-tcg-tracers.h: $(obj)/generated-tcg-tracers.h-timestamp @@ -55,5 +55,5 @@ $(obj)/generated-tcg-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUILD_DIR)/ util-obj-$(CONFIG_TRACE_SIMPLE) += simple.o util-obj-$(CONFIG_TRACE_FTRACE) += ftrace.o util-obj-y += control.o -target-obj-y += control-target.o +obj-y += control-target.o util-obj-y += qmp.o