From patchwork Thu Mar 28 16:01:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1068405 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 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 44VVNm32BBz9sRx for ; Fri, 29 Mar 2019 03:16:24 +1100 (AEDT) Received: from localhost ([127.0.0.1]:38885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9XhW-0005FM-5y for incoming@patchwork.ozlabs.org; Thu, 28 Mar 2019 12:16:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h9Xbm-00073o-Te for qemu-devel@nongnu.org; Thu, 28 Mar 2019 12:10:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9Xbm-0006SH-0r for qemu-devel@nongnu.org; Thu, 28 Mar 2019 12:10:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34948) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h9Xbl-0006Rv-Oc; Thu, 28 Mar 2019 12:10:25 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3AB8F8831D; Thu, 28 Mar 2019 16:01:43 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-116-220.ams2.redhat.com [10.36.116.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id 647498389D; Thu, 28 Mar 2019 16:01:39 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 28 Mar 2019 17:01:00 +0100 Message-Id: <20190328160101.3854-5-lvivier@redhat.com> In-Reply-To: <20190328160101.3854-1-lvivier@redhat.com> References: <20190328160101.3854-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 28 Mar 2019 16:01:43 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 4/5] build: chardev is only needed for softmmu targets 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: Laurent Vivier , Thomas Huth , David Hildenbrand , Cornelia Huck , qemu-s390x@nongnu.org, Gerd Hoffmann , Stefan Hajnoczi , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Move the dependency from SUBDIR_RULES to SOFTMMU_SUBDIR_RULES Suggested-by: Paolo Bonzini Signed-off-by: Laurent Vivier --- Makefile | 3 ++- Makefile.objs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 094de049ade2..2b169d1d2ca5 100644 --- a/Makefile +++ b/Makefile @@ -439,6 +439,7 @@ SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) $(SOFTMMU_SUBDIR_RULES): $(authz-obj-y) $(SOFTMMU_SUBDIR_RULES): $(block-obj-y) +$(SOFTMMU_SUBDIR_RULES): $(chardev-obj-y) $(SOFTMMU_SUBDIR_RULES): $(crypto-obj-y) $(SOFTMMU_SUBDIR_RULES): $(io-obj-y) $(SOFTMMU_SUBDIR_RULES): config-all-devices.mak @@ -474,7 +475,7 @@ subdir-capstone: .git-submodule-status subdir-slirp: .git-submodule-status $(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp BUILD_DIR="$(BUILD_DIR)/slirp" CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" CFLAGS="$(QEMU_CFLAGS)") -$(SUBDIR_RULES): libqemuutil.a $(common-obj-y) $(chardev-obj-y) \ +$(SUBDIR_RULES): libqemuutil.a $(common-obj-y) \ $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY)) ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) diff --git a/Makefile.objs b/Makefile.objs index dda5bbc9101f..43c9e4503297 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -129,9 +129,9 @@ trace-events-subdirs += accel/kvm trace-events-subdirs += accel/tcg trace-events-subdirs += authz trace-events-subdirs += block -trace-events-subdirs += chardev trace-events-subdirs += crypto ifeq ($(CONFIG_SOFTMMU),y) +trace-events-subdirs += chardev trace-events-subdirs += audio trace-events-subdirs += hw/9pfs trace-events-subdirs += hw/acpi