From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=56801 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PITyJ-0004Pu-Bo
	for qemu-devel@nongnu.org; Tue, 16 Nov 2010 17:25:52 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1PITyI-0001OY-Bx
	for qemu-devel@nongnu.org; Tue, 16 Nov 2010 17:25:51 -0500
Received: from mail-vw0-f45.google.com ([209.85.212.45]:39590)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1PITyI-0001OI-3h
	for qemu-devel@nongnu.org; Tue, 16 Nov 2010 17:25:50 -0500
Received: by vws5 with SMTP id 5so722649vws.4
	for <qemu-devel@nongnu.org>; Tue, 16 Nov 2010 14:25:49 -0800 (PST)
Message-ID: <4CE304EA.5040407@codemonkey.ws>
Date: Tue, 16 Nov 2010 16:25:46 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH] Fix compilation failure with simple trace
	when srcdir==objdir
References: <4CE2D468.4020604@codemonkey.ws>
	<1289938027-28282-1-git-send-email-peter.maydell@linaro.org>
In-Reply-To: <1289938027-28282-1-git-send-email-peter.maydell@linaro.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-devel@nongnu.org

On 11/16/2010 02:07 PM, Peter Maydell wrote:
> 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<peter.maydell@linaro.org>
>    

Applied.  Thanks.

Regards,

Anthony Liguori
> ---
>   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
>