From 70762fe16bc68f3cfe02adb1b791a4dbae12d27d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 9 Feb 2008 16:01:53 +0100 Subject: Support 'mkinclude' command in .mk files. (This used to be commit ee7f54c86d2b467869db8dea33f60e19ed3c742f) --- source4/build/smb_build/config_mk.pm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/build/smb_build/config_mk.pm') diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index aa075490bc..b7dc9697a9 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -251,6 +251,8 @@ sub run_config_mk($$$$) next; } + $line =~ s/^mkinclude /include /; + # empty line if ($line =~ /^[ \t]*$/) { $section = "GLOBAL"; -- cgit From 105c6fec24c0775fde548c32d87b7e482a0edff3 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 11 Feb 2008 01:42:29 +0100 Subject: Avoid autogenerating the Makefile but rather include a data.mk file that is autogenerated. (This used to be commit 95967e8bfbdce2e073a3fc938f1271da40b543d3) --- source4/build/smb_build/config_mk.pm | 2 -- 1 file changed, 2 deletions(-) (limited to 'source4/build/smb_build/config_mk.pm') 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"; -- cgit From 094769618e180cae404f5951b969e9c6c778e421 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 18 Feb 2008 19:46:27 +0100 Subject: Use implicit build system element creation for external libraries. (This used to be commit 3b08f190c9dd4567e684c804a22e2612f405bbec) --- source4/build/smb_build/config_mk.pm | 2 -- 1 file changed, 2 deletions(-) (limited to 'source4/build/smb_build/config_mk.pm') diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index aa075490bc..ed05a4e4d9 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -18,7 +18,6 @@ my $section_types = { "CFLAGS" => "list", "CPPFLAGS" => "list", "LDFLAGS" => "list", - "PC_NAME" => "string", }, "PYTHON" => { SWIG_FILE => "string", @@ -90,7 +89,6 @@ my $section_types = { "SO_VERSION" => "string", "LIBRARY_REALNAME" => "string", - "PC_NAME" => "string", "PC_FILE" => "string", "INIT_FUNCTION_TYPE" => "string", -- cgit From ff0315ba859421dff6aba055887e086fa68c2951 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 18 Feb 2008 20:04:18 +0100 Subject: Rename include to mkinclude to emphasize it is different from make's include. (This used to be commit 0e1d0a874ae3d22b8f97a79b81fe0af3ef53a771) --- source4/build/smb_build/config_mk.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/build/smb_build/config_mk.pm') diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index ed05a4e4d9..4d8db8a04e 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -239,7 +239,7 @@ sub run_config_mk($$$$) } # include - if ($line =~ /^include (.*)$/) { + if ($line =~ /^mkinclude (.*)$/) { my $subfile= $1; my $subdir = dirname($filename); $subdir =~ s/^\.$//g; -- cgit