Commit b82f66cf authored by Arnout Vandecappelle's avatar Arnout Vandecappelle Committed by Thomas Petazzoni
Browse files

graph-depends: support calling from recursive make 



The graph-depends script calls make. If the outer make was called
recursively, or if it was called with '-C <somedir>', then the
environment will contain "MAKEFLAGS=w --". Therefore, the recursive
make prints 'Entering' and 'Leaving' messages, which clobbers the
output for dot.

To avoid this, add "--no-print-directory" to the recursive make
arguments. Since we require GNU make 3.81, we can be sure that this
option is available.

Signed-off-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent fa9f824c

support/scripts/graph-depends

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ allpkgs = [] 
# list is used as the starting point for full dependency graphs

def get_targets():

    sys.stderr.write("Getting targets\n")

    cmd = ["make", "-s", "show-targets"]

    cmd = ["make", "-s", "--no-print-directory", "show-targets"]

    p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)

    output = p.communicate()[0].strip()

    if p.returncode != 0:
@@ -95,7 +95,7 @@ def get_targets(): 
# dependencies formatted as a Python dictionary.

def get_depends(pkgs):

    sys.stderr.write("Getting dependencies for %s\n" % pkgs)

    cmd = ["make", "-s" ]

    cmd = ["make", "-s", "--no-print-directory" ]

    for pkg in pkgs:

        cmd.append("%s-show-depends" % pkg)

    p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)