diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-03-03 16:30:33 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-03-15 12:22:19 +1100 |
| commit | 6c6ab50a40853c0d5d552967bccf11a16ecfc913 (patch) | |
| tree | 9f8646f714eea3e7756cb448b1058ad8df467b93 | |
| parent | 5ca9db07f5580ca5285fbdbc307fa225e923fda1 (diff) | |
| download | samba-6c6ab50a40853c0d5d552967bccf11a16ecfc913.tar.gz samba-6c6ab50a40853c0d5d552967bccf11a16ecfc913.tar.bz2 samba-6c6ab50a40853c0d5d552967bccf11a16ecfc913.zip | |
waf: build substituted public headers in build tree
the bin/default/include/public directory will contain headers that are
ready to install
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 4 | ||||
| -rw-r--r-- | libcli/security/wscript_build | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 91cd2839db..181bbae333 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 3f2e06a908..5b4d61453c 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' ) |