s4: Rename WBCLIENT to wbclient.

diff --git a/nsswitch/libwbclient/wscript_build b/nsswitch/libwbclient/wscript_build
index d34599a27664927f58c88e4f9eb6c0b9a9a0463e..6e01b1b2e253478f5a0af686e2f7de53183f3e7e 100644 (file)
--- 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 8ae72bff5405ddb0106ffc55652aa22bcfd71a15..6837f5ec531a7b6fdf4f355e3df77093442f1792 100644 (file)
--- 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 eb5d9b0ae275f2d7a39dd5a3cc8d68307cefb196..bbb47d78815e98fc0a69dd08b545b8f400acfbfb 100644 (file)
--- 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 80dfd1a56435d7221fe26178623acb67f6caf585..b384c829e3efe9696e6d4243ca2c2f3f49c9309b 100644 (file)
--- 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
        )