diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-09-28 18:18:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:39:08 -0500 |
| commit | 5058f4b9e82ca8b9f2405930db3a46b8c37f06ed (patch) | |
| tree | 008fb92b76381b2070568a27b905ff64608cb2b0 /source4/auth | |
| parent | 09ee7a470ba052d184f94336cd7635efca387ace (diff) | |
| download | samba-5058f4b9e82ca8b9f2405930db3a46b8c37f06ed.tar.gz samba-5058f4b9e82ca8b9f2405930db3a46b8c37f06ed.tar.bz2 samba-5058f4b9e82ca8b9f2405930db3a46b8c37f06ed.zip | |
r10586: Add MergedObject() builder. Default to Library() rather
then StaticLibrary()
(This used to be commit b53313dc517986c69a4e4cb8fe3885b696f8faa1)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/SConscript | 20 | ||||
| -rw-r--r-- | source4/auth/gensec/SConscript | 12 |
2 files changed, 16 insertions, 16 deletions
diff --git a/source4/auth/SConscript b/source4/auth/SConscript index 7b1358b908..f5151fd97f 100644 --- a/source4/auth/SConscript +++ b/source4/auth/SConscript @@ -1,12 +1,12 @@ #!/usr/bin/env python Import('hostenv') -hostenv.StaticLibrary('auth_sam.c') -hostenv.StaticLibrary('auth_anonymous.c') -hostenv.StaticLibrary('auth_winbind.c') -hostenv.StaticLibrary('auth_domain.c') -hostenv.StaticLibrary('auth_developer.c') -hostenv.StaticLibrary('auth_unix.c') +hostenv.Library('auth_sam.c') +hostenv.Library('auth_anonymous.c') +hostenv.Library('auth_winbind.c') +hostenv.Library('auth_domain.c') +hostenv.Library('auth_developer.c') +hostenv.Library('auth_unix.c') if hostenv['configure']: conf = hostenv.Configure() @@ -14,17 +14,17 @@ if hostenv['configure']: conf.Finish() proto_files = [] -hostenv.StaticLibrary('pam_errors.c') +hostenv.Library('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.Library('auth',auth_files) ntlmssp_files = ['ntlmssp/ntlmssp_parse.c', 'ntlmssp/ntlmssp.c', 'ntlmssp/ntlmssp_sign.c','ntlmssp/ntlmssp_client.c', 'ntlmssp/ntlmssp_server.c'] proto_files += ntlmssp_files -hostenv.StaticLibrary('gensec_ntlmssp', ntlmssp_files) +hostenv.Library('gensec_ntlmssp', ntlmssp_files) kerberos_files = ['kerberos/kerberos.c','kerberos/clikrb5.c', 'kerberos/kerberos_verify.c','kerberos/kerberos_util.c', @@ -33,7 +33,7 @@ kerberos_files = ['kerberos/kerberos.c','kerberos/clikrb5.c', proto_files += kerberos_files -hostenv.StaticLibrary('kerberos', kerberos_files) +hostenv.Library('kerberos', kerberos_files) hostenv.proto_headers += hostenv.CProtoHeader('proto.h', proto_files) diff --git a/source4/auth/gensec/SConscript b/source4/auth/gensec/SConscript index 3c90d2b4eb..b576a7afb9 100644 --- a/source4/auth/gensec/SConscript +++ b/source4/auth/gensec/SConscript @@ -6,9 +6,9 @@ gensec_files = ['gensec.c', 'gensec_krb5.c', 'gensec_gssapi.c', 'spnego.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','spnego_parse.c']) -hostenv.StaticLibrary('gensec_schannel',['schannel.c','schannel_sign.c']) -hostenv.StaticLibrary('schanneldb',['schannel_state.c']) +hostenv.Library('gensec',['gensec.c']) +hostenv.Library('gensec_krb5',['gensec_krb5.c']) +hostenv.Library('gensec_gssapi',['gensec_gssapi.c']) +hostenv.Library('gensec_spnego',['spnego.c','spnego_parse.c']) +hostenv.Library('gensec_schannel',['schannel.c','schannel_sign.c']) +hostenv.Library('schanneldb',['schannel_state.c']) |