From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NBCML-00038P-MF
	for qemu-devel@nongnu.org; Thu, 19 Nov 2009 14:08:01 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NBCMH-00035v-09
	for qemu-devel@nongnu.org; Thu, 19 Nov 2009 14:08:01 -0500
Received: from [199.232.76.173] (port=39717 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NBCMG-00035q-Ro
	for qemu-devel@nongnu.org; Thu, 19 Nov 2009 14:07:56 -0500
Received: from moutng.kundenserver.de ([212.227.17.8]:61344)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <stefan@weilnetz.de>) id 1NBCMG-000537-92
	for qemu-devel@nongnu.org; Thu, 19 Nov 2009 14:07:56 -0500
From: Stefan Weil <weil@mail.berlios.de>
Date: Thu, 19 Nov 2009 20:07:52 +0100
Message-Id: <1258657672-9897-1-git-send-email-weil@mail.berlios.de>
In-Reply-To: <AEB6CD253AD84E9CB90053B0DD7A7E80@FSCPC>
References: <AEB6CD253AD84E9CB90053B0DD7A7E80@FSCPC>
Subject: [Qemu-devel] [PATCH] Fix build for mingw32 on windows ($@ in macro)
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.gnu.org/pipermail/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: av1474@comtv.ru, herbszt@gmx.de, QEMU Developers <qemu-devel@nongnu.org>

Make using mingw32 on windows does not preserve $@ in macros
when they are modified using this pattern:
target: macro += something

This behaviour results in an error when QEMU_CFLAGS containing
"-MMD -MP -MT $@" is modified for compilation of source files
which use SDL: $@ will expand to nothing, -MT no longer has
the correct argument (it will take the next one from the command
line) and the build will fail or run with a wrong command line.

The problem is fixed by using a new macro QEMU_DGFLAGS
which is not modified by a target rule.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 rules.mak |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/rules.mak b/rules.mak
index 77a801b..16713ba 100644
--- a/rules.mak
+++ b/rules.mak
@@ -11,16 +11,17 @@ MAKEFLAGS += -rR
 %.m:
 %.mak:
 
-QEMU_CFLAGS += -MMD -MP -MT $@
+# Flags for dependency generation
+QEMU_DGFLAGS += -MMD -MP -MT $@
 
 %.o: %.c $(GENERATED_HEADERS)
-	$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) -c -o $@ $<,"  CC    $(TARGET_DIR)$@")
+	$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<,"  CC    $(TARGET_DIR)$@")
 
 %.o: %.S
-	$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) -c -o $@ $<,"  AS    $(TARGET_DIR)$@")
+	$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<,"  AS    $(TARGET_DIR)$@")
 
 %.o: %.m
-	$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) -c -o $@ $<,"  OBJC  $(TARGET_DIR)$@")
+	$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<,"  OBJC  $(TARGET_DIR)$@")
 
 LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(1) $(ARLIBS_BEGIN) $(ARLIBS) $(ARLIBS_END) $(LIBS),"  LINK  $(TARGET_DIR)$@")
 
-- 
1.5.6.5