summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-23 16:23:53 -0700
committerJelmer Vernooij <jelmer@samba.org>2010-10-24 00:20:04 +0000
commita57bd4e2d8b79f5ea57cd5727702c6d56e934231 (patch)
tree3848971b7f4938881a6cef1fadfb80fae52fbb6e
parent18ae8887a364872644cc133705101f3cd9cfbd74 (diff)
downloadsamba-a57bd4e2d8b79f5ea57cd5727702c6d56e934231.tar.gz
samba-a57bd4e2d8b79f5ea57cd5727702c6d56e934231.tar.bz2
samba-a57bd4e2d8b79f5ea57cd5727702c6d56e934231.zip
s4: Rename WBCLIENT to wbclient.
-rw-r--r--nsswitch/libwbclient/wscript_build10
-rw-r--r--nsswitch/wscript_build34
-rw-r--r--source4/auth/ntlm/wscript_build2
-rw-r--r--source4/torture/winbind/wscript_build2
4 files changed, 24 insertions, 24 deletions
diff --git a/nsswitch/libwbclient/wscript_build b/nsswitch/libwbclient/wscript_build
index d34599a276..6e01b1b2e2 100644
--- a/nsswitch/libwbclient/wscript_build
+++ b/nsswitch/libwbclient/wscript_build
@@ -1,7 +1,7 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('LIBWBCLIENT',
- source='wbc_guid.c wbc_idmap.c wbclient.c wbc_pam.c wbc_pwd.c wbc_sid.c wbc_util.c',
- deps='libwinbind-client',
- private_library=True
- )
+bld.SAMBA_LIBRARY('wbclient',
+ source='wbc_guid.c wbc_idmap.c wbclient.c wbc_pam.c wbc_pwd.c wbc_sid.c wbc_util.c',
+ deps='winbind-client',
+ private_library=True
+ )
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 8ae72bff54..6837f5ec53 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -1,11 +1,11 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('libwinbind-client',
- source='wb_common.c',
- deps='replace',
- cflags='-DSOCKET_WRAPPER_DISABLE=1 -DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
- private_library=True
- )
+bld.SAMBA_LIBRARY('winbind-client',
+ source='wb_common.c',
+ deps='replace',
+ cflags='-DSOCKET_WRAPPER_DISABLE=1 -DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
+ private_library=True
+ )
bld.SAMBA_BINARY('nsstest',
@@ -16,19 +16,19 @@ bld.SAMBA_BINARY('nsstest',
bld.SAMBA_BINARY('wbinfo',
source='wbinfo.c',
- deps='libsamba-util LIBCLI_AUTH popt POPT_SAMBA libwinbind-client LIBWBCLIENT tevent UTIL_TEVENT LIBASYNC_REQ libsecurity LIBNDR NDR_SECURITY'
+ deps='libsamba-util LIBCLI_AUTH popt POPT_SAMBA winbind-client wbclient tevent UTIL_TEVENT LIBASYNC_REQ libsecurity LIBNDR NDR_SECURITY'
)
bld.SAMBA_LIBRARY('nss_winbind',
- source='../nsswitch/winbind_nss_linux.c',
- deps='libwinbind-client',
- realname='libnss_winbind.so.2',
- vnum='2')
+ source='../nsswitch/winbind_nss_linux.c',
+ deps='winbind-client',
+ realname='libnss_winbind.so.2',
+ vnum='2')
if bld.CONFIG_SET('HAVE_PAM_START'):
- bld.SAMBA_LIBRARY('pamwinbind',
- source='../nsswitch/pam_winbind.c',
- deps='talloc LIBWBCLIENT libwinbind-client LIBINIPARSER pam',
- cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
- realname='pam_winbind.so',
- )
+ bld.SAMBA_LIBRARY('pamwinbind',
+ source='../nsswitch/pam_winbind.c',
+ deps='talloc wbclient winbind-client LIBINIPARSER pam',
+ cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
+ realname='pam_winbind.so',
+ )
diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index eb5d9b0ae2..bbb47d7881 100644
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -27,7 +27,7 @@ bld.SAMBA_MODULE('auth_winbind',
source='auth_winbind.c',
subsystem='auth',
init_function='auth_winbind_init',
- deps='RPC_NDR_WINBIND MESSAGING LIBWBCLIENT'
+ deps='RPC_NDR_WINBIND MESSAGING wbclient'
)
diff --git a/source4/torture/winbind/wscript_build b/source4/torture/winbind/wscript_build
index 80dfd1a564..b384c829e3 100644
--- a/source4/torture/winbind/wscript_build
+++ b/source4/torture/winbind/wscript_build
@@ -5,6 +5,6 @@ bld.SAMBA_MODULE('TORTURE_WINBIND',
autoproto='proto.h',
subsystem='smbtorture',
init_function='torture_winbind_init',
- deps='LIBWBCLIENT libwinbind-client torture PAM_ERRORS',
+ deps='wbclient winbind-client torture PAM_ERRORS',
internal_module=True
)