diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-09-24 16:23:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:52 -0500 |
| commit | 3d4ea18d4dd9031adc16348c16595d6c216b2d84 (patch) | |
| tree | b43aba2aff1820c4ed365132cc2feca544ed402a /source4/auth | |
| parent | 63b43dd12fb579aaaccedd07aaa630cb1cd7aa88 (diff) | |
| download | samba-3d4ea18d4dd9031adc16348c16595d6c216b2d84.tar.gz samba-3d4ea18d4dd9031adc16348c16595d6c216b2d84.tar.bz2 samba-3d4ea18d4dd9031adc16348c16595d6c216b2d84.zip | |
r10478: More work on proto headers; we now generate a couple of smaller ones
that are then included by include/proto.h
(This used to be commit 703ffbaaaca11f3d8781cfe9e7542fcaa626d991)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/SConscript | 16 | ||||
| -rw-r--r-- | source4/auth/gensec/SConscript | 4 | ||||
| -rw-r--r-- | source4/auth/ntlmssp/SConscript | 5 |
3 files changed, 16 insertions, 9 deletions
diff --git a/source4/auth/SConscript b/source4/auth/SConscript index 557690cfdb..a14fc2f48d 100644 --- a/source4/auth/SConscript +++ b/source4/auth/SConscript @@ -1,3 +1,4 @@ +#!/usr/bin/env python Import('hostenv') hostenv.StaticLibrary('auth_sam.c') @@ -12,7 +13,18 @@ if hostenv['configure']: have_pam = conf.CheckLibWithHeader('pam', 'security/pam_appl.h', 'c', 'pam_start') conf.Finish() +proto_files = [] hostenv.StaticLibrary('pam_errors.c') -hostenv.StaticLibrary('auth',['auth.c','auth_util.c','auth_sam_reply.c','ntlm_check.c']) +proto_files += ['pam_errors.c'] +auth_files = ['auth.c','auth_util.c','auth_sam_reply.c','ntlm_check.c'] +proto_files += auth_files +hostenv.StaticLibrary('auth',auth_files) -SConscript(dirs=['ntlmssp','kerberos','gensec']) +hostenv.proto_headers += hostenv.CProtoHeader('proto.h', proto_files) + +hostenv.StaticLibrary('gensec_ntlmssp', + ['ntlmssp/ntlmssp_parse.c', 'ntlmssp/ntlmssp.c', + 'ntlmssp/ntlmssp_sign.c','ntlmssp/ntlmssp_client.c', + 'ntlmssp/ntlmssp_server.c']) + +SConscript(dirs=['kerberos','gensec']) diff --git a/source4/auth/gensec/SConscript b/source4/auth/gensec/SConscript index 93b291fb1b..404f70e77c 100644 --- a/source4/auth/gensec/SConscript +++ b/source4/auth/gensec/SConscript @@ -1,9 +1,9 @@ -Import('hostenv', 'proto_files') +Import('hostenv') gensec_files = ['gensec.c', 'gensec_krb5.c', 'gensec_gssapi.c', 'spnego.c', 'schannel.c', 'schannel_sign.c', 'schannel_state.c'] -proto_files += [File(x) for x in gensec_files] +hostenv.proto_headers += hostenv.CProtoHeader('proto.h', gensec_files) hostenv.StaticLibrary('gensec',['gensec.c']) hostenv.StaticLibrary('gensec_krb5',['gensec_krb5.c']) diff --git a/source4/auth/ntlmssp/SConscript b/source4/auth/ntlmssp/SConscript deleted file mode 100644 index 1fb21c02cd..0000000000 --- a/source4/auth/ntlmssp/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -Import('hostenv') - -hostenv.StaticLibrary('gensec_ntlmssp', - ['ntlmssp_parse.c','ntlmssp.c','ntlmssp_sign.c','ntlmssp_client.c', - 'ntlmssp_server.c']) |