waf: build substituted public headers in build tree
authorAndrew Tridgell <tridge@samba.org>
Thu, 3 Mar 2011 05:30:33 +0000 (16:30 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 15 Mar 2011 01:22:19 +0000 (12:22 +1100)
the bin/default/include/public directory will contain headers that are
ready to install

buildtools/wafsamba/wafsamba.py
libcli/security/wscript_build

index 91cd283..181bbae 100644 (file)
@@ -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
 
index 3f2e06a..5b4d614 100644 (file)
@@ -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'
                   )