From patchwork Tue Nov 16 20:07:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 71449 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 38C3CB713D for ; Wed, 17 Nov 2010 07:09:29 +1100 (EST) Received: from localhost ([127.0.0.1]:39148 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIRqH-0006nU-CT for incoming@patchwork.ozlabs.org; Tue, 16 Nov 2010 15:09:25 -0500 Received: from [140.186.70.92] (port=57375 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIRoC-0005tZ-Mb for qemu-devel@nongnu.org; Tue, 16 Nov 2010 15:07:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PIRoB-0000cd-CP for qemu-devel@nongnu.org; Tue, 16 Nov 2010 15:07:16 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:58040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PIRoB-0000Zu-5c for qemu-devel@nongnu.org; Tue, 16 Nov 2010 15:07:15 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.69) (envelope-from ) id 1PIRo3-0007Ma-Mc for qemu-devel@nongnu.org; Tue, 16 Nov 2010 20:07:07 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 16 Nov 2010 20:07:07 +0000 Message-Id: <1289938027-28282-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <4CE2D468.4020604@codemonkey.ws> References: <4CE2D468.4020604@codemonkey.ws> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH] Fix compilation failure with simple trace when srcdir==objdir X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fix a makefile error that meant that qemu would not compile if the source and object directories were the same. Signed-off-by: Peter Maydell --- Makefile.target | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile.target b/Makefile.target index a5e6410..652c7d2 100644 --- a/Makefile.target +++ b/Makefile.target @@ -30,6 +30,7 @@ endif endif PROGS=$(QEMU_PROG) +STPFILES= ifndef CONFIG_HAIKU LIBS+=-lm @@ -41,19 +42,17 @@ config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak ifdef CONFIG_SYSTEMTAP_TRACE -trace: $(QEMU_PROG).stp +STPFILES+=$(QEMU_PROG).stp $(QEMU_PROG).stp: $(call quiet-command,sh $(SRC_PATH)/tracetool \ --$(TRACE_BACKEND) \ --bindir $(bindir) \ --target $(TARGET_ARCH) \ - -s < $(SRC_PATH)/trace-events > $(QEMU_PROG).stp," GEN $(QEMU_PROG).stp") -else -trace: + -s < $(SRC_PATH)/trace-events > $@," GEN $@") endif -all: $(PROGS) trace +all: $(PROGS) $(STPFILES) # Dummy command so that make thinks it has done something @true @@ -363,7 +362,7 @@ endif endif ifdef CONFIG_SYSTEMTAP_TRACE $(INSTALL_DIR) "$(DESTDIR)$(datadir)/../systemtap/tapset" - $(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(datadir)/../systemtap/tapset" + $(INSTALL_DATA) $(STPFILES) "$(DESTDIR)$(datadir)/../systemtap/tapset" endif # Include automatically generated dependency files