summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-02-23 11:17:06 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:35 +1000
commitff9f972d5558052b0346672df182966e947a5169 (patch)
treee3aefa47c4c0fa6007a9ae4d7c177e34c6436b2f
parenta3421fe6e9a823adce0b2c6fd3edcb2f476c9acf (diff)
downloadsamba-ff9f972d5558052b0346672df182966e947a5169.tar.gz
samba-ff9f972d5558052b0346672df182966e947a5169.tar.bz2
samba-ff9f972d5558052b0346672df182966e947a5169.zip
build: added public_headers support
-rwxr-xr-xbuildtools/mktowscript/mktowscript.pl12
-rw-r--r--lib/replace/wafsamba.py4
2 files changed, 15 insertions, 1 deletions
diff --git a/buildtools/mktowscript/mktowscript.pl b/buildtools/mktowscript/mktowscript.pl
index b1a929a4b3..18c8779055 100755
--- a/buildtools/mktowscript/mktowscript.pl
+++ b/buildtools/mktowscript/mktowscript.pl
@@ -210,7 +210,6 @@ foreach my $s (sort {$result->{$a}->{SECNUMBER} <=> $result->{$b}->{SECNUMBER}}
$k eq "COV_TARGET" ||
$k eq "GCOV" ||
$k eq "PC_FILES" ||
- $k eq "PUBLIC_HEADERS" ||
$k eq "CONFIG4FILE" ||
$k eq "LMHOSTSFILE4") {
$trailer .= sprintf(",\n\t# %s='%s'", $k, trim($sec->{$k}));
@@ -273,6 +272,17 @@ foreach my $s (sort {$result->{$a}->{SECNUMBER} <=> $result->{$b}->{SECNUMBER}}
$trailer .= sprintf(",\n\tautoproto='%s'", $list);
next;
}
+ if ($k eq "PUBLIC_HEADERS") {
+ my $list = trim(strlist($sec->{$k}));
+ if ($list =~ /\$\(addprefix .*,(.*)\)(.*)$/) {
+ $list = trim("$1 $2");
+ $list = find_files($list);
+ } else {
+ $list = trim(find_files(strlist($sec->{$k})));
+ }
+ $trailer .= sprintf(",\n\tpublic_headers='%s'", $list);
+ next;
+ }
if ($k eq "MANPAGES") {
my $list = trim(find_files(strlist($sec->{$k})));
$trailer .= sprintf(",\n\tmanpages='%s'", $list);
diff --git a/lib/replace/wafsamba.py b/lib/replace/wafsamba.py
index c7ceaf9631..5afdd4af1b 100644
--- a/lib/replace/wafsamba.py
+++ b/lib/replace/wafsamba.py
@@ -160,9 +160,11 @@ def SAMBA_LIBRARY(bld, libname, source_list,
deps='',
public_deps='',
include_list='.',
+ public_headers=None,
vnum=None,
cflags=None,
autoproto=None):
+ # print "Declaring SAMBA_LIBRARY %s" % libname
ilist = bld.SAMBA_LIBRARY_INCLUDE_LIST(deps) + bld.SUBDIR(bld.curdir, include_list)
ilist = bld.NORMPATH(ilist)
bld(
@@ -194,6 +196,7 @@ def SAMBA_BINARY(bld, binname, source_list,
deps='',
syslibs='',
include_list='',
+ public_headers=None,
modules=None,
installdir=None,
ldflags=None,
@@ -274,6 +277,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source_list,
deps='',
public_deps='',
include_list='.',
+ public_headers=None,
autoproto=None,
cflags=None,
init_function_sentinal=None):