From patchwork Sat May 15 11:03:28 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Put dependency files in proper subdir
Date: Sat, 15 May 2010 01:03:28 -0000
From: Jan Kiszka <jan.kiszka@web.de>
X-Patchwork-Id: 52704
Message-Id: <4BEE7F80.2090203@web.de>
To: qemu-devel <qemu-devel@nongnu.org>, Juan Quintela <quintela@redhat.com>
Cc: 

From: Jan Kiszka <jan.kiszka@siemens.com>

This seems to resolve subtle breakages of our build system:

Dependency files generated for targets like 'dir/foo.o' were saved as
'foo.d'. Now, if there was also a target 'foo.o', one of the dependency
file was overwritten. Concrete example: libhw*/macio.o vs.
libhw*/ide/macio.o. And this often left a segfaulting build result
behind when changing the "wrong" data structures".

Fix it by generating proper 'dir/foo.d'.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Juan Quintela <quintela@redhat.com>

---
rules.mak |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-o $@ $<,"  CC    $(TARGET_DIR)$@")

diff --git a/rules.mak b/rules.mak
index 7e10432..c843a13 100644
--- a/rules.mak
+++ b/rules.mak
@@ -12,7 +12,7 @@ MAKEFLAGS += -rR
 %.mak:

 # Flags for dependency generation
-QEMU_DGFLAGS += -MMD -MP -MT $@
+QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d

 %.o: %.c
 	$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c