[Xen-changelog] [xen stable-4.2] tools: fix dependency file generation

[patchbot@xxxxxxx]

commit 3ef9022508e6e331e1bedb173a0aad509ceb69aa
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu May 23 10:15:55 2013 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu May 23 10:15:55 2013 +0200

    tools: fix dependency file generation
    
    There is a small set of places where files in subdirectories get
    compiled from the parent directory. Dependency file wise this is no
    problem as long as the files use names distinct without regard to the
    directories they sit in, and tools/console/ violates this (in having
    two main.c files). Hence we need to avoid losing the directory name,
    both to ensure the two compiler instances don't simultaneously write
    to the same file (happening of which is what triggered me looking
    into this) and to guarantee dependencies for all files will be seen
    by make on an incremental rebuild.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    master commit: 4d788e164d6556d931bc3e0a69e36b8cf7280794
    master date: 2013-05-21 10:16:30 +0200
---
 tools/Rules.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/Rules.mk b/tools/Rules.mk
index f4e84c1..e83f682 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -62,7 +62,7 @@ SHLIB_libxenlight  = -Wl,-rpath-link=$(XEN_XENLIGHT)
 CFLAGS += -D__XEN_TOOLS__
 
 # Get gcc to generate the dependencies for us.
-CFLAGS += -MMD -MF .$(@F).d
+CFLAGS += -MMD -MF .$(if $(filter-out .,$(@D)),$(subst /,@,$(@D))@)$(@F).d
 DEPS = .*.d
 
 ifneq ($(XEN_OS),NetBSD)
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.2

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog