summaryrefslogtreecommitdiff
path: root/source4/build/smb_build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-17 13:55:10 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:57:35 -0500
commit5b0051e0325aea7e46715aa61bba0a1dc025132c (patch)
treeb3878a49f922a4e5c1fe801efd973722b3f88f89 /source4/build/smb_build
parent66b2ed2866ae994fd4f48b568a2e8328de6015a0 (diff)
downloadsamba-5b0051e0325aea7e46715aa61bba0a1dc025132c.tar.gz
samba-5b0051e0325aea7e46715aa61bba0a1dc025132c.tar.bz2
samba-5b0051e0325aea7e46715aa61bba0a1dc025132c.zip
r14511: Install more headers
(This used to be commit e1f896948fad8cf5a1aec300865c250c5721ee7d)
Diffstat (limited to 'source4/build/smb_build')
-rw-r--r--source4/build/smb_build/config_mk.pm3
-rw-r--r--source4/build/smb_build/input.pm17
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});
}