From patchwork Thu Sep 1 08:06:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 112848 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 167B4B6F80 for ; Thu, 1 Sep 2011 19:14:30 +1000 (EST) Received: from localhost ([::1]:59087 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qz2JX-0006Cj-0C for incoming@patchwork.ozlabs.org; Thu, 01 Sep 2011 04:07:55 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34737) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qz2IQ-0002Un-SN for qemu-devel@nongnu.org; Thu, 01 Sep 2011 04:06:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qz2IG-0007cE-PS for qemu-devel@nongnu.org; Thu, 01 Sep 2011 04:06:41 -0400 Received: from mtagate3.uk.ibm.com ([194.196.100.163]:59670) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qz2IG-0007Xb-Hn for qemu-devel@nongnu.org; Thu, 01 Sep 2011 04:06:36 -0400 Received: from d06nrmr1707.portsmouth.uk.ibm.com (d06nrmr1707.portsmouth.uk.ibm.com [9.149.39.225]) by mtagate3.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p8186UrG024815 for ; Thu, 1 Sep 2011 08:06:30 GMT Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p8186T6B1835096 for ; Thu, 1 Sep 2011 09:06:29 +0100 Received: from d06av09.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p8186T9m020031 for ; Thu, 1 Sep 2011 02:06:29 -0600 Received: from stefanha-thinkpad.manchester-maybrook.uk.ibm.com (dyn-9-174-219-30.manchester-maybrook.uk.ibm.com [9.174.219.30]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p8186RXP019938; Thu, 1 Sep 2011 02:06:28 -0600 From: Stefan Hajnoczi To: Date: Thu, 1 Sep 2011 09:06:15 +0100 Message-Id: <1314864386-14202-5-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1314864386-14202-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1314864386-14202-1-git-send-email-stefanha@linux.vnet.ibm.com> MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by mtagate3.uk.ibm.com id p8186UrG024815 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 194.196.100.163 Cc: Anthony Liguori , =?UTF-8?q?Llu=C3=ADs?= , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= Subject: [Qemu-devel] [PATCH 04/15] trace: [make] replace 'ifeq' with values in CONFIG_TRACE_* X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Lluís Signed-off-by: Lluís Vilanova --- Makefile.objs | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 44d7238..833158b 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -374,16 +374,14 @@ endif simpletrace.o: simpletrace.c $(GENERATED_HEADERS) -ifeq ($(TRACE_BACKEND),dtrace) -trace-obj-y = trace-dtrace.o -else +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o +ifneq ($(TRACE_BACKEND),dtrace) trace-obj-y = trace.o -ifeq ($(TRACE_BACKEND),simple) -trace-obj-y += simpletrace.o -trace-obj-y += qemu-timer-common.o -endif endif +trace-obj-$(CONFIG_TRACE_SIMPLE) += simpletrace.o +trace-obj-$(CONFIG_TRACE_SIMPLE) += qemu-timer-common.o + ###################################################################### # smartcard