From 74947964d915890adc524ca279ca95d96c4e8e34 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 24 Feb 2011 13:00:52 +1100 Subject: [PATCH] build: moved spnego_parse.c into a common subsystem --- libcli/auth/wscript_build | 6 +++++- source3/wscript_build | 4 ---- source4/auth/gensec/wscript_build | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build index 3d9e8e6283..0f0e22ba91 100644 --- a/libcli/auth/wscript_build +++ b/libcli/auth/wscript_build @@ -2,7 +2,7 @@ bld.SAMBA_LIBRARY('cliauth', source='', - deps='NTLMSSP_COMMON MSRPC_PARSE LIBCLI_AUTH COMMON_SCHANNEL PAM_ERRORS', + deps='NTLMSSP_COMMON MSRPC_PARSE LIBCLI_AUTH COMMON_SCHANNEL PAM_ERRORS SPNEGO_PARSE', private_library=True, grouping_library=True) @@ -34,3 +34,7 @@ bld.SAMBA_SUBSYSTEM('PAM_ERRORS', source='pam_errors.c', deps='talloc' ) + +bld.SAMBA_SUBSYSTEM('SPNEGO_PARSE', + source='spnego_parse.c', + deps='ASN1_UTIL') diff --git a/source3/wscript_build b/source3/wscript_build index 0008bd016e..1347574331 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -928,10 +928,6 @@ bld.SAMBA3_SUBSYSTEM('SLCACHE', source=SLCACHE_SRC, vars=locals()) -bld.SAMBA3_SUBSYSTEM('SPNEGO_PARSE', - source='../libcli/auth/spnego_parse.c', - vars=locals()) - bld.SAMBA3_SUBSYSTEM('DCUTIL', source=DCUTIL_SRC, vars=locals()) diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build index 01b3ce9ee2..8f8a6e84c7 100644 --- a/source4/auth/gensec/wscript_build +++ b/source4/auth/gensec/wscript_build @@ -37,11 +37,11 @@ bld.SAMBA_MODULE('cyrus_sasl', bld.SAMBA_MODULE('gensec_spnego', - source='spnego.c ../../../libcli/auth/spnego_parse.c', + source='spnego.c', autoproto='spnego_proto.h', subsystem='gensec', init_function='gensec_spnego_init', - deps='ASN1_UTIL credentials' + deps='ASN1_UTIL credentials SPNEGO_PARSE' ) -- 2.34.1