waf: build substituted public headers in build tree

the bin/default/include/public directory will contain headers that are
ready to install

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 91cd2839db17a51aaf84c649eecdb04aa44537da..181bbae333b2abf583f8ce3df318cc8b46c06b41 100644 (file)
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -537,6 +537,7 @@ Build.BuildContext.SAMBA_SUBSYSTEM = SAMBA_SUBSYSTEM
 def SAMBA_GENERATOR(bld, name, rule, source='', target='',
                     group='generators', enabled=True,
                     public_headers=None,
+                    public_headers_install=True,
                     header_path=None,
                     vars=None,
                     always=False):
@@ -565,7 +566,8 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='',
         t.always = True
 
     if public_headers is not None:
-        bld.PUBLIC_HEADERS(public_headers, header_path=header_path)
+        bld.PUBLIC_HEADERS(public_headers, header_path=header_path,
+                           public_headers_install=public_headers_install)
     return t
 Build.BuildContext.SAMBA_GENERATOR = SAMBA_GENERATOR
 

diff --git a/libcli/security/wscript_build b/libcli/security/wscript_build
index 3f2e06a908ba8236f012ce155fad5a412d83e1c9..5b4d61453cac7c4d5b44136e724fc6ed54a7a034 100644 (file)
--- a/libcli/security/wscript_build
+++ b/libcli/security/wscript_build
@@ -4,6 +4,8 @@
 bld.SAMBA_LIBRARY('security',
                   source='dom_sid.c display_sec.c secace.c secacl.c security_descriptor.c sddl.c privileges.c security_token.c access_check.c object_tree.c create_descriptor.c util_sid.c session.c',
                   private_library=True,
+                  public_headers='security.h dom_sid.h secace.h secacl.h security_descriptor.h security_token.h sddl.h privileges.h access_check.h session.h',
+                  header_path='security',
                   deps='talloc ndr NDR_SECURITY'
                   )