diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-08 11:16:45 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-04-13 11:47:36 +1000 |
| commit | 5694ba507cf3774f6f1d30bb2b584a5f28b88a4b (patch) | |
| tree | 8d3acf06c14d004551927c0f917455350e242ab6 /source3 | |
| parent | 601835ee6db8952911216f8f7f02f5101dc3b269 (diff) | |
| download | samba-5694ba507cf3774f6f1d30bb2b584a5f28b88a4b.tar.gz samba-5694ba507cf3774f6f1d30bb2b584a5f28b88a4b.tar.bz2 samba-5694ba507cf3774f6f1d30bb2b584a5f28b88a4b.zip | |
libcli/ldap pull LIBCLI_LDAP_MESSAGE and LIBCLI_LDAP_NDR into a library
This reduces symbol duplication
Andrew Bartlett
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/passdb/wscript_build | 2 | ||||
| -rwxr-xr-x | source3/wscript_build | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build index 2c0416f681..79b143507f 100644 --- a/source3/passdb/wscript_build +++ b/source3/passdb/wscript_build @@ -28,7 +28,7 @@ bld.SAMBA3_MODULE('pdb_ldap', bld.SAMBA3_MODULE('pdb_ads', subsystem='pdb', source=PDB_ADS_SRC, - deps='LIBCLI_LDAP_NDR TLDAP', + deps='cli-ldap-common TLDAP', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ads'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ads')) diff --git a/source3/wscript_build b/source3/wscript_build index 12b79447e0..300f5b3863 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -808,7 +808,7 @@ bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI', bld.SAMBA3_SUBSYSTEM('CLDAP', source='libads/cldap.c', - deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR LIBCLI_CLDAP LIBTSOCKET', + deps='cli-ldap-common LIBCLI_CLDAP LIBTSOCKET', vars=locals()) bld.SAMBA3_SUBSYSTEM('SECRETS3', @@ -824,7 +824,7 @@ bld.SAMBA3_SUBSYSTEM('SMBLDAP', bld.SAMBA3_LIBRARY('ads', source=LIBADS_SRC, - deps='LIBCLI_LDAP_NDR krb5 gssapi gssapi_krb5 ldap lber', + deps='cli-ldap-common krb5 gssapi gssapi_krb5 ldap lber', private_library=True, vars=locals(), enabled=bld.env.HAVE_ADS) @@ -1136,7 +1136,7 @@ bld.SAMBA3_BINARY('pdbedit', source=PDBEDIT_SRC, deps='''talloc tdb tevent cap resolv wbclient param LIB_NONSMBD LIBNTLMSSP LIBSMB_ERR POPT_SAMBA3 passdb SMBLDAP - PASSWD_UTIL LIBCLI_LDAP_NDR''', + PASSWD_UTIL cli-ldap-common''', vars=locals()) bld.SAMBA3_BINARY('smbget', @@ -1262,7 +1262,7 @@ bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3, deps='''tdb talloc cap resolv krb5 k5crypto com_err wbclient param LIB_NONSMBD samba3core LIBNTLMSSP POPT_SAMBA3 asn1util LIBTSOCKET passdb SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER - NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''', + NDR_SAMR NDR_LSA NDR_NETLOGON cli-ldap-common LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''', vars=locals()) bld.SAMBA3_BINARY('timelimit', |