Avoid autogenerating the Makefile but rather include a data.mk file

that is autogenerated.
(This used to be commit 95967e8bfbdce2e073a3fc938f1271da40b543d3)

3 files changed, 1 insertions, 7 deletions

diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index b7dc9697a9..aa075490bc 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -251,8 +251,6 @@ sub run_config_mk($$$$)
 			next;
 		}
 
-		$line =~ s/^mkinclude /include /;
-
 		# empty line
 		if ($line =~ /^[ \t]*$/) {
 			$section = "GLOBAL";
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index fb769103d0..ff540215f7 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -80,7 +80,7 @@ foreach my $key (values %$OUTPUT) {
 					 defined($key->{PUBLIC_PROTO_HEADER});
 }
 
-$mkenv->write("Makefile");
+$mkenv->write("data.mk");
 header::create_smb_build_h($OUTPUT, "include/build.h");
 
 cflags::create_cflags($OUTPUT, $config::config{srcdir},
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 865d231c0c..0393e2b258 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -41,14 +41,10 @@ sub new($$$)
 
 	$self->{mkfile} = $mkfile;
 
-	$self->output("#!gmake\n");
 	$self->output("################################################\n");
 	$self->output("# Autogenerated by build/smb_build/makefile.pm #\n");
 	$self->output("################################################\n");
 	$self->output("\n");
-	$self->output("include mkconfig.mk\n");
-
-	$self->output("default: all\n\n");
 
 	$self->_prepare_compiler_linker();