summaryrefslogtreecommitdiff
path: root/source4/build/smb_build/main.pl
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-08-03 03:09:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:31:01 -0500
commit916505f66197b8ed9d767ea45e13cb3fd8319ae7 (patch)
tree0d86ae8e644b395cc7d777e7f3b318ec8b6ae8f7 /source4/build/smb_build/main.pl
parentf10b2af0f8234d99c76cf7dd2e8c95ad6c3c4678 (diff)
downloadsamba-916505f66197b8ed9d767ea45e13cb3fd8319ae7.tar.gz
samba-916505f66197b8ed9d767ea45e13cb3fd8319ae7.tar.bz2
samba-916505f66197b8ed9d767ea45e13cb3fd8319ae7.zip
r8974: Support makefile fragments in .mk files
(This used to be commit 8d9c18a1b4cf31ebae1d0c84b00b4d781f55de66)
Diffstat (limited to 'source4/build/smb_build/main.pl')
-rw-r--r--source4/build/smb_build/main.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index abe63ffaba..de7f4cd9ec 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -18,10 +18,10 @@ use strict;
my $INPUT = {};
-config_mk::import_files($INPUT, "config.list");
+my $mkfile = config_mk::import_files($INPUT, "config.list");
my $DEPEND = smb_build::input::check($INPUT, \%config::enabled);
my $OUTPUT = output::create_output($DEPEND);
-makefile::create_makefile_in($OUTPUT, "Makefile.in");
+makefile::create_makefile_in($OUTPUT, $mkfile, "Makefile.in");
smb_build_h::create_smb_build_h($OUTPUT, "include/smb_build.h");
open DOTTY, ">samba4-deps.dot";