From 6c6ab50a40853c0d5d552967bccf11a16ecfc913 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 3 Mar 2011 16:30:33 +1100 Subject: [PATCH] waf: build substituted public headers in build tree the bin/default/include/public directory will contain headers that are ready to install --- buildtools/wafsamba/wafsamba.py | 4 +++- libcli/security/wscript_build | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 91cd2839db1..181bbae333b 100644 --- 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 3f2e06a908b..5b4d61453ca 100644 --- 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' ) -- 2.34.1