From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=44685 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ODFBG-0003op-PK for qemu-devel@nongnu.org; Sat, 15 May 2010 07:05:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ODF9X-0000Vq-7n for qemu-devel@nongnu.org; Sat, 15 May 2010 07:05:18 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:36142) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ODF9W-0000VY-Vw for qemu-devel@nongnu.org; Sat, 15 May 2010 07:03:31 -0400 Message-ID: <4BEE7F80.2090203@web.de> Date: Sat, 15 May 2010 13:03:28 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH] Put dependency files in proper subdir List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel , Juan Quintela From: Jan Kiszka 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 --- rules.mak | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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 -o $@ $<," CC $(TARGET_DIR)$@") -- 1.6.0.2