r12680: Support setting the environment variable SMB_BUILD_VERBOSE to

print out more debug info
(This used to be commit a54fefbfc5b2796cf8c47f22629ec86bca39cd39)

diff --git a/source4/build/smb_build/dot.pl b/source4/build/smb_build/dot.pl
index 9ecbc8a7b120e20c7d7659ba28e58b91c86f83f8..e7b0985f117b534084f1f71adaa186701cb216fa 100755 (executable)
--- a/source4/build/smb_build/dot.pl
+++ b/source4/build/smb_build/dot.pl
@@ -22,7 +22,7 @@ sub generate($)
 }
 
 my $INPUT = {};
-smb_build::config_mk::run_config_mk($INPUT, "main.mk");
+smb_build::config_mk::run_config_mk($INPUT, '.', "main.mk");
 
 print __FILE__.": creating samba4-deps.dot\n";
 open DOTTY, ">samba4-deps.dot";

diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index dfbd26c290f68be1b763b36f54a7a6d52d955def..c34930f39a0ba942c3759a6271a581664b98b562 100644 (file)
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -114,21 +114,28 @@ sub check_binary($$)
        $bin->{OUTPUT_TYPE} = "BINARY";
 }
 
-sub calc_unique_deps($$)
+my $level = "";
+
+sub calc_unique_deps($$$)
 {
-       sub calc_unique_deps($$);
-       my ($deps, $udeps) = @_;
+       sub calc_unique_deps($$$);
+       my ($name, $deps, $udeps) = @_;
+
+       print "$level-> $name\n" if ($ENV{SMB_BUILD_VERBOSE});
+       $level.=" ";
 
        foreach my $dep (@{$deps}) {
                if (not defined($udeps->{$$dep->{NAME}})) {
                   if (defined ($$dep->{OUTPUT_TYPE}) && (($$dep->{OUTPUT_TYPE} eq "OBJ_LIST")
                            or ($$dep->{OUTPUT_TYPE} eq "MERGEDOBJ"))) {
                                $udeps->{$$dep->{NAME}} = "BUSY";
-                               calc_unique_deps($$dep->{DEPENDENCIES}, $udeps);
+                               calc_unique_deps($$dep->{NAME}, $$dep->{DEPENDENCIES}, $udeps);
                        }
                        $udeps->{$$dep->{NAME}} = $$dep;
                }
        }
+       
+       $level = substr($level, 1);
 }
 
 sub check($$$$$)
@@ -185,7 +192,7 @@ sub check($$$$$)
 
        foreach my $part (values %depend) {
                $part->{UNIQUE_DEPENDENCIES} = {};
-               calc_unique_deps($part->{DEPENDENCIES}, $part->{UNIQUE_DEPENDENCIES});
+               calc_unique_deps($part->{NAME}, $part->{DEPENDENCIES}, $part->{UNIQUE_DEPENDENCIES});
        }
 
        return \%depend;