From patchwork Thu Jan 16 09:13:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1224099 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=QJUc1j7a; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47yz6s69z0z9sR0 for ; Thu, 16 Jan 2020 20:15:01 +1100 (AEDT) Received: from localhost ([::1]:38808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1is1Ex-0002yX-MR for incoming@patchwork.ozlabs.org; Thu, 16 Jan 2020 04:14:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36190) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1is1Db-00022x-S6 for qemu-devel@nongnu.org; Thu, 16 Jan 2020 04:13:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1is1DY-0002Xv-2b for qemu-devel@nongnu.org; Thu, 16 Jan 2020 04:13:35 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:34717 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1is1DX-0002XW-VT for qemu-devel@nongnu.org; Thu, 16 Jan 2020 04:13:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579166011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/UpAN3DhoJ3BUGURReP4AJ8K6hzzG8vCFofr0nVySu8=; b=QJUc1j7azezACEY2c/mf1ZdnvRBM+qhsEvjD6HlrEgG5BS8K4V92HazbZTFwFkVFEZo8We PMwUdDHPaENwnQ/LZg3sI2znV5knHwb57uqawMjfUNXOIBZwPERQApxsKDC1uX9mGqUdKI R/T3VJVPO46kARkgfzsqReqTg0UiM7c= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-108-WUlVjE-HM3WgwypU-RxD3w-1; Thu, 16 Jan 2020 04:13:26 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E0F29800A02; Thu, 16 Jan 2020 09:13:24 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-187.brq.redhat.com [10.40.205.187]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0E1B888894; Thu, 16 Jan 2020 09:13:16 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH] Makefile: Keep trace-events-subdirs ordered Date: Thu, 16 Jan 2020 10:13:14 +0100 Message-Id: <20200116091314.25024-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: WUlVjE-HM3WgwypU-RxD3w-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Damien Hedde , Laurent Vivier , qemu-trivial@nongnu.org, Alexey Kardashevskiy , Stefan Hajnoczi , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" To ease review and reduce likelihood of merge failures (see [*]), keep trace-events-subdirs ordered when possible, following eb7ccb3c0. [*] https://www.mail-archive.com/qemu-devel@nongnu.org/msg671007.html Duplicate trace-events-subdirs entries generates duplicated symbols when using the LTTng Userspace Tracer library. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Damien Hedde --- "Fixes: 26b8e6dc & 8d5d515a0" To be even safer we should use $(sort $(trace-events-subdirs)) --- Makefile.objs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 7c1e50f9d6..d62f908965 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -142,8 +142,8 @@ trace-events-subdirs += nbd trace-events-subdirs += scsi endif ifeq ($(CONFIG_SOFTMMU),y) -trace-events-subdirs += chardev trace-events-subdirs += audio +trace-events-subdirs += chardev trace-events-subdirs += hw/9pfs trace-events-subdirs += hw/acpi trace-events-subdirs += hw/alpha @@ -191,6 +191,7 @@ trace-events-subdirs += migration trace-events-subdirs += net trace-events-subdirs += ui endif +trace-events-subdirs += hw/core trace-events-subdirs += hw/display trace-events-subdirs += qapi trace-events-subdirs += qom @@ -203,7 +204,6 @@ trace-events-subdirs += target/riscv trace-events-subdirs += target/s390x trace-events-subdirs += target/sparc trace-events-subdirs += util -trace-events-subdirs += hw/core trace-events-files = $(SRC_PATH)/trace-events $(trace-events-subdirs:%=$(SRC_PATH)/%/trace-events)