summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libcli/cldap/wscript_build2
-rw-r--r--source4/ldap_server/wscript_build2
-rw-r--r--source4/lib/ldb/wscript2
-rw-r--r--source4/libcli/ldap/wscript_build2
-rw-r--r--source4/torture/wscript_build2
-rw-r--r--source4/winbind/wscript_build2
6 files changed, 6 insertions, 6 deletions
diff --git a/libcli/cldap/wscript_build b/libcli/cldap/wscript_build
index 77767a3f42..296532227e 100644
--- a/libcli/cldap/wscript_build
+++ b/libcli/cldap/wscript_build
@@ -3,7 +3,7 @@
bld.SAMBA_SUBSYSTEM('LIBCLI_CLDAP',
source='cldap.c',
- public_deps='LIBCLI_LDAP',
+ public_deps='cli_ldap',
deps='LIBTSOCKET libsamba-util UTIL_TEVENT ldb LIBCLI_NETLOGON'
)
diff --git a/source4/ldap_server/wscript_build b/source4/ldap_server/wscript_build
index 1729a998db..3ff215a7b8 100644
--- a/source4/ldap_server/wscript_build
+++ b/source4/ldap_server/wscript_build
@@ -6,6 +6,6 @@ bld.SAMBA_MODULE('LDAP',
autoproto='proto.h',
subsystem='service',
init_function='server_service_ldap_init',
- deps='CREDENTIALS LIBCLI_LDAP SAMDB process_model gensec libsamba-hostconfig samba_server_gensec'
+ deps='CREDENTIALS cli_ldap SAMDB process_model gensec libsamba-hostconfig samba_server_gensec'
)
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 1fe3547eaf..1dc89f5ec0 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -84,7 +84,7 @@ def build(bld):
# this is only in the s4 build
bld.SAMBA_MODULE('ldb_ildap', 'ldb_ildap/ldb_ildap.c',
init_function='LDB_BACKEND(ldapi),LDB_BACKEND(ldaps),LDB_BACKEND(ldap)',
- deps='talloc LIBCLI_LDAP CREDENTIALS auth_system_session',
+ deps='talloc cli_ldap CREDENTIALS auth_system_session',
aliases='ldb_ldaps ldb_ldapi ldb_ldap',
internal_module=False,
subsystem='ldb')
diff --git a/source4/libcli/ldap/wscript_build b/source4/libcli/ldap/wscript_build
index 91b1012d03..ea7c785cdf 100644
--- a/source4/libcli/ldap/wscript_build
+++ b/source4/libcli/ldap/wscript_build
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('LIBCLI_LDAP',
+bld.SAMBA_LIBRARY('cli_ldap',
source='ldap_client.c ldap_bind.c ldap_ildap.c ldap_controls.c',
autoproto='ldap_proto.h',
public_deps='libsamba-errors tevent LIBPACKET',
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 7b7ed58001..a79d25c79b 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -102,7 +102,7 @@ bld.SAMBA_MODULE('TORTURE_UNIX',
bld.SAMBA_MODULE('TORTURE_LDAP',
source='ldap/common.c ldap/basic.c ldap/schema.c ldap/uptodatevector.c ldap/cldap.c ldap/cldapbench.c ldap/ldap_sort.c ldap/nested_search.c',
subsystem='smbtorture',
- deps='LIBCLI_LDAP LIBCLI_CLDAP SAMDB POPT_CREDENTIALS torture LDBSAMBA',
+ deps='cli_ldap LIBCLI_CLDAP SAMDB POPT_CREDENTIALS torture LDBSAMBA',
internal_module=True,
autoproto='ldap/proto.h',
init_function='torture_ldap_init'
diff --git a/source4/winbind/wscript_build b/source4/winbind/wscript_build
index bd1090b277..ab8588979f 100644
--- a/source4/winbind/wscript_build
+++ b/source4/winbind/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_MODULE('WINBIND',
autoproto='wb_proto.h',
subsystem='service',
init_function='server_service_winbind_init',
- deps='WB_HELPER IDMAP NDR_WINBIND process_model RPC_NDR_LSA dcerpc_samr PAM_ERRORS LIBCLI_LDAP libsamba-net LIBSAMBA_TSOCKET'
+ deps='WB_HELPER IDMAP NDR_WINBIND process_model RPC_NDR_LSA dcerpc_samr PAM_ERRORS cli_ldap libsamba-net LIBSAMBA_TSOCKET'
)