r3733: More build system fixes/features:

 - Use .mk files directly (no need for a SMB_*_MK() macro when adding a new SUBSYSTEM, MODULE or BINARY). This allows addition of new modules and subsystems without running configure
 - Add support for generating .dot files with the Samba4 dependency tree (as used by the graphviz and springgraph utilities)
(This used to be commit 64826da834e26ee0488674e27a0eae36491ee179)

1 files changed, 11 insertions, 0 deletions

diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm
index 50aae15fdc..324b8adc61 100644
--- a/source4/build/smb_build/main.pm
+++ b/source4/build/smb_build/main.pm
@@ -12,6 +12,7 @@ use input;
 use config_mk;
 use output;
 use direct;
+use dot;
 use strict;
 
 sub smb_build_main($)
@@ -21,6 +22,12 @@ sub smb_build_main($)
 		INPUT => $INPUT
 	);
 
+	my @mkfiles = split /\n/, `find -name "*.mk"`; 
+
+	for my $mkfile (@mkfiles) {
+		config_mk::import_file($SMB_BUILD_CTX{INPUT}, $mkfile);
+	}
+
 	%{$SMB_BUILD_CTX{DEPEND}} = input::check(\%SMB_BUILD_CTX);
 	
 	%{$SMB_BUILD_CTX{OUTPUT}} = output::create_output($SMB_BUILD_CTX{DEPEND});
@@ -28,5 +35,9 @@ sub smb_build_main($)
 	makefile::create_makefile_in($SMB_BUILD_CTX{OUTPUT});
 
 	smb_build_h::create_smb_build_h($SMB_BUILD_CTX{OUTPUT});
+
+	open DOTTY, ">samba4-deps.dot";
+	print DOTTY dot::generate($SMB_BUILD_CTX{DEPEND});
+	close DOTTY;
 }
 1;