summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-08 11:16:45 +1000
committerAndrew Tridgell <tridge@samba.org>2011-04-13 11:47:36 +1000
commit5694ba507cf3774f6f1d30bb2b584a5f28b88a4b (patch)
tree8d3acf06c14d004551927c0f917455350e242ab6 /source4
parent601835ee6db8952911216f8f7f02f5101dc3b269 (diff)
downloadsamba-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 'source4')
-rw-r--r--source4/dsdb/wscript_build4
-rw-r--r--source4/libcli/ldap/wscript_build2
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index 364edf14b2..83d7433c3f 100644
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('samdb',
autoproto='samdb/samdb_proto.h',
public_deps='krb5',
vnum='0.0.1',
- deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA ldbsamba samdb-common LIBCLI_DRSUAPI LIBCLI_LDAP_NDR samba-util com_err authkrb5 credentials ldbwrap',
+ deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA ldbsamba samdb-common LIBCLI_DRSUAPI cli-ldap-common samba-util com_err authkrb5 credentials ldbwrap',
)
@@ -16,7 +16,7 @@ bld.SAMBA_LIBRARY('samdb-common',
source='common/util.c common/util_groups.c common/util_samr.c common/dsdb_dn.c common/dsdb_access.c',
autoproto='common/proto.h',
private_library=True,
- deps='ldb NDR_DRSBLOBS UTIL_LDB LIBCLI_AUTH samba-hostconfig samba_socket LIBCLI_LDAP_NDR flag_mapping'
+ deps='ldb NDR_DRSBLOBS UTIL_LDB LIBCLI_AUTH samba-hostconfig samba_socket cli-ldap-common flag_mapping'
)
diff --git a/source4/libcli/ldap/wscript_build b/source4/libcli/ldap/wscript_build
index a7b3717543..99b6c4e1f3 100644
--- a/source4/libcli/ldap/wscript_build
+++ b/source4/libcli/ldap/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_LIBRARY('cli-ldap',
autoproto='ldap_proto.h',
public_deps='errors tevent LIBPACKET',
public_headers='libcli_ldap.h:ldap-util.h',
- deps='LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS LIBCLI_LDAP_NDR ndr LP_RESOLVE gensec LIBCLI_LDAP_MESSAGE',
+ deps='LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS ndr LP_RESOLVE gensec cli-ldap-common',
private_library=True
)