From e337caeed1459f876449611ae1684616d0ea8f55 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 26 Sep 2005 15:15:50 +0000 Subject: r10509: Some more sconscript fixes. Now getting to link stage for smbclient (This used to be commit 6df956edbab7ad5e72b2f20e74ab0f0d62528932) --- source4/auth/SConscript | 24 +++++++++++++++++------- source4/auth/gensec/SConscript | 5 +++-- source4/auth/kerberos/SConscript | 6 ------ 3 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 source4/auth/kerberos/SConscript (limited to 'source4/auth') diff --git a/source4/auth/SConscript b/source4/auth/SConscript index a14fc2f48d..7b1358b908 100644 --- a/source4/auth/SConscript +++ b/source4/auth/SConscript @@ -15,16 +15,26 @@ if hostenv['configure']: proto_files = [] hostenv.StaticLibrary('pam_errors.c') -proto_files += ['pam_errors.c'] +proto_files += ['pam_errors.c', 'auth_sam.c'] auth_files = ['auth.c','auth_util.c','auth_sam_reply.c','ntlm_check.c'] proto_files += auth_files hostenv.StaticLibrary('auth',auth_files) -hostenv.proto_headers += hostenv.CProtoHeader('proto.h', proto_files) - -hostenv.StaticLibrary('gensec_ntlmssp', - ['ntlmssp/ntlmssp_parse.c', 'ntlmssp/ntlmssp.c', +ntlmssp_files = ['ntlmssp/ntlmssp_parse.c', 'ntlmssp/ntlmssp.c', 'ntlmssp/ntlmssp_sign.c','ntlmssp/ntlmssp_client.c', - 'ntlmssp/ntlmssp_server.c']) + 'ntlmssp/ntlmssp_server.c'] +proto_files += ntlmssp_files +hostenv.StaticLibrary('gensec_ntlmssp', ntlmssp_files) + +kerberos_files = ['kerberos/kerberos.c','kerberos/clikrb5.c', + 'kerberos/kerberos_verify.c','kerberos/kerberos_util.c', + 'kerberos/kerberos_pac.c','kerberos/gssapi_parse.c', + 'kerberos/krb5_init_context.c'] + +proto_files += kerberos_files + +hostenv.StaticLibrary('kerberos', kerberos_files) + +hostenv.proto_headers += hostenv.CProtoHeader('proto.h', proto_files) -SConscript(dirs=['kerberos','gensec']) +SConscript(dirs=['gensec']) diff --git a/source4/auth/gensec/SConscript b/source4/auth/gensec/SConscript index 404f70e77c..3c90d2b4eb 100644 --- a/source4/auth/gensec/SConscript +++ b/source4/auth/gensec/SConscript @@ -1,13 +1,14 @@ Import('hostenv') gensec_files = ['gensec.c', 'gensec_krb5.c', 'gensec_gssapi.c', 'spnego.c', - 'schannel.c', 'schannel_sign.c', 'schannel_state.c'] + 'spnego_parse.c', 'schannel.c', 'schannel_sign.c', + 'schannel_state.c'] hostenv.proto_headers += hostenv.CProtoHeader('proto.h', gensec_files) hostenv.StaticLibrary('gensec',['gensec.c']) hostenv.StaticLibrary('gensec_krb5',['gensec_krb5.c']) hostenv.StaticLibrary('gensec_gssapi',['gensec_gssapi.c']) -hostenv.StaticLibrary('gensec_spnego',['spnego.c']) +hostenv.StaticLibrary('gensec_spnego',['spnego.c','spnego_parse.c']) hostenv.StaticLibrary('gensec_schannel',['schannel.c','schannel_sign.c']) hostenv.StaticLibrary('schanneldb',['schannel_state.c']) diff --git a/source4/auth/kerberos/SConscript b/source4/auth/kerberos/SConscript deleted file mode 100644 index 8272f1c24a..0000000000 --- a/source4/auth/kerberos/SConscript +++ /dev/null @@ -1,6 +0,0 @@ -Import('hostenv') - -hostenv.StaticLibrary('kerberos', - ['kerberos.c','clikrb5.c','kerberos_verify.c', - 'kerberos_util.c','kerberos_pac.c','gssapi_parse.c', - 'krb5_init_context.c']) -- cgit