diff options
| -rwxr-xr-x | buildtools/mktowscript/mktowscript.pl | 8 | ||||
| -rw-r--r-- | lib/replace/wafsamba.py | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/buildtools/mktowscript/mktowscript.pl b/buildtools/mktowscript/mktowscript.pl index d3dd67f4a5..2ebf2d92c2 100755 --- a/buildtools/mktowscript/mktowscript.pl +++ b/buildtools/mktowscript/mktowscript.pl @@ -150,6 +150,9 @@ sub read_config_mk($) next; } + if ($line =~ /\$\(eval.\$\(call.proto_header_template.*,(.*),.*/) { + $result->{$section}->{AUTOPROTO} = $1; + } if ($line =~ /^\$\(eval/) { # skip eval lines for now next; @@ -259,6 +262,11 @@ foreach my $s (sort {$result->{$a}->{SECNUMBER} <=> $result->{$b}->{SECNUMBER}} $trailer .= sprintf(",\n\toutput_type='%s'", strlist($sec->{$k})); next; } + if ($k eq "AUTOPROTO") { + my $list = trim(find_files(strlist($sec->{$k}))); + $trailer .= sprintf(",\n\tautoproto='%s'", $list); + next; + } if ($k eq "$s" . "_OBJ_FILES") { my $list = trim(strlist($sec->{$k})); $list =~ s/\.o/.c/g; diff --git a/lib/replace/wafsamba.py b/lib/replace/wafsamba.py index 7796dc25bf..0077c7a294 100644 --- a/lib/replace/wafsamba.py +++ b/lib/replace/wafsamba.py @@ -161,7 +161,8 @@ def SAMBA_LIBRARY(bld, libname, source_list, public_deps='', include_list='.', vnum=None, - cflags=None): + cflags=None, + autoproto=None): ilist = bld.SAMBA_LIBRARY_INCLUDE_LIST(deps) + bld.SUBDIR(bld.curdir, include_list) ilist = bld.NORMPATH(ilist) bld( @@ -196,7 +197,8 @@ def SAMBA_BINARY(bld, binname, source_list, modules=None, installdir=None, ldflags=None, - cflags=None): + cflags=None, + autoproto=None): ilist = '. ' + os.environ.get('PWD') + '/bin/default ' + bld.SAMBA_LIBRARY_INCLUDE_LIST(deps) + ' ' + include_list ilist = bld.NORMPATH(ilist) ccflags = '' |