diff options
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 3 | ||||
| -rw-r--r-- | source4/build/smb_build/input.pm | 17 |
2 files changed, 6 insertions, 14 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index 2bc2953567..6be817c58d 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -63,7 +63,8 @@ my $section_types = { "MANPAGE" => "string", "INSTALLDIR" => "string", "PRIVATE_PROTO_HEADER" => "string", - "PUBLIC_HEADERS" => "string", + "PUBLIC_PROTO_HEADER" => "string", + "PUBLIC_HEADERS" => "list", "EXTRA_CFLAGS" => "string" }, diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 369e4aa75b..704dafa371 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -147,18 +147,6 @@ sub check($$$$$) my ($INPUT, $enabled, $subsys_ot, $lib_ot, $module_ot) = @_; foreach my $part (values %$INPUT) { - unless(defined($part->{NOPROTO})) { - if ($part->{TYPE} eq "MODULE" or $part->{TYPE} eq "BINARY") { - $part->{NOPROTO} = "YES"; - } else { - $part->{NOPROTO} = "NO"; - } - } - - if (defined($part->{PRIVATE_PROTO_HEADER})) { - $part->{NOPROTO} = "YES"; - } - unless (defined($part->{STANDARD_VISIBILITY})) { if ($part->{TYPE} eq "MODULE" or $part->{TYPE} eq "BINARY") { $part->{STANDARD_VISIBILITY} = "hidden"; @@ -170,9 +158,12 @@ sub check($$$$$) unless (defined($part->{EXTRA_CFLAGS})) { $part->{EXTRA_CFLAGS} = ""; } + + unless (defined($part->{PUBLIC_HEADERS})) { + $part->{PUBLIC_HEADERS} = []; + } if (defined($part->{PUBLIC_PROTO_HEADER})) { - $part->{NOPROTO} = "YES"; push (@{$part->{PUBLIC_HEADERS}}, $part->{PUBLIC_PROTO_HEADER}); } |