build: added public_headers support

diff --git a/buildtools/mktowscript/mktowscript.pl b/buildtools/mktowscript/mktowscript.pl
index b1a929a4b31f54684c87359c51412bfb956546d1..18c8779055ac66e6407d27fb0b88e3f322c9bc09 100755 (executable)
--- 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 c7ceaf96311477d62372dcf8c70047cb6c4c3208..5afdd4af1ba689e7103295d0d8e630612ce6e9fa 100644 (file)
--- 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):