The branch, master has been updated
via a6611c1 torture/local: Depend on NSS_WRAPPER, even if it wasn't
enabled.
via 92c12a3 ldb: Rename pyldb pkg-config file to pyldb-util, to avoid
confusion with 'ldb' python module.
via 599afb0 s4: Rename LIBCLI_NBT -> cli_nbt.
via 5224de3 s4: Rename LIBCLI_LDAP to libcli_ldap.
via a57bd4e s4: Rename WBCLIENT to wbclient.
via 18ae888 s4: Rename DB_GLUE to db_glue.
via fc6bfe2 s4: Rename SMBPASSWD to smbpasswd.
via 8c99517 waf: Lowercase several library names.
via 833480d s4: Rename LIBSAMBA-* to libsamba-*
via ca16d80 s4: Rename LIBSECURITY{_SESSION,} to libsecurity{_session,}
via 7a731cc s4: Rename SAMDB_COMMON to samdb_common.
via 2bcd7f6 waf: Rename LIBWINBIND-CLIENT to libwinbind-client
from 2933fac s4: Rename NSS_WRAPPER to nss_wrapper.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a6611c16a80adf0170e8e574dff3907bdfa9b0b3
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 17:18:56 2010 -0700
torture/local: Depend on NSS_WRAPPER, even if it wasn't enabled.
torture_local tests nss_wrapper.
Autobuild-User: Jelmer Vernooij <[email protected]>
Autobuild-Date: Sun Oct 24 01:02:00 UTC 2010 on sn-devel-104
commit 92c12a39a9b8d7bade00090f2a38a49ac3af13f6
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 16:38:57 2010 -0700
ldb: Rename pyldb pkg-config file to pyldb-util, to avoid confusion with
'ldb' python module.
commit 599afb065160a9444636fada9576c8b3e889ab68
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 16:29:45 2010 -0700
s4: Rename LIBCLI_NBT -> cli_nbt.
commit 5224de3f748fe76c6423f8ed660886faf99882f8
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 16:27:47 2010 -0700
s4: Rename LIBCLI_LDAP to libcli_ldap.
commit a57bd4e2d8b79f5ea57cd5727702c6d56e934231
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 16:23:53 2010 -0700
s4: Rename WBCLIENT to wbclient.
commit 18ae8887a364872644cc133705101f3cd9cfbd74
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 16:21:00 2010 -0700
s4: Rename DB_GLUE to db_glue.
commit fc6bfe24fd54b50cfa42853090b86f777a2247bf
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 16:19:23 2010 -0700
s4: Rename SMBPASSWD to smbpasswd.
Rename DSDB_MODULE to dsdb_module.
commit 8c99517a0cadf9931156a27ce9103321b8ea9a5c
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 16:12:14 2010 -0700
waf: Lowercase several library names.
commit 833480d3ad1c4b3a1ea74fd583672c65c0af6463
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 16:05:50 2010 -0700
s4: Rename LIBSAMBA-* to libsamba-*
commit ca16d805bd8f33a03d67d3ed74b4d468b04874e5
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 15:53:52 2010 -0700
s4: Rename LIBSECURITY{_SESSION,} to libsecurity{_session,}
commit 7a731ccdfc83c9ce11cf92f190cf250ffb43c293
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 15:48:49 2010 -0700
s4: Rename SAMDB_COMMON to samdb_common.
commit 2bcd7f68278df69ce18a344e2a1351c66edf9e0c
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 15:30:42 2010 -0700
waf: Rename LIBWINBIND-CLIENT to libwinbind-client
-----------------------------------------------------------------------
Summary of changes:
lib/tdr/wscript_build | 2 +-
lib/torture/wscript_build | 2 +-
lib/util/wscript_build | 2 +-
libcli/auth/wscript_build | 2 +-
libcli/cldap/wscript_build | 4 +-
libcli/ldap/wscript_build | 8 ++--
libcli/nbt/wscript_build | 10 ++--
libcli/security/wscript_build | 2 +-
libgpo/wscript_build | 2 +-
librpc/wscript_build | 26 +++++-----
nsswitch/libwbclient/wscript_build | 10 ++--
nsswitch/wscript_build | 36 +++++++-------
source3/wscript_build | 28 ++++++------
source4/auth/credentials/wscript_build | 2 +-
source4/auth/gensec/wscript_build | 2 +-
source4/auth/ntlm/wscript_build | 16 +++---
source4/auth/wscript_build | 2 +-
source4/client/wscript_build | 4 +-
source4/dns_server/wscript_build | 2 +-
source4/dsdb/samdb/ldb_modules/wscript_build | 50 ++++++++++----------
source4/dsdb/wscript_build | 18 ++++----
source4/heimdal_build/wscript_build | 2 +-
source4/kdc/wscript_build | 16 +++---
source4/ldap_server/wscript_build | 2 +-
source4/lib/cmdline/wscript_build | 4 +-
source4/lib/com/wscript_build | 2 +-
source4/lib/events/wscript_build | 2 +-
source4/lib/ldb-samba/wscript_build | 2 +-
source4/lib/ldb/{pyldb.pc.in => pyldb-util.pc.in} | 2 +-
source4/lib/ldb/wscript | 14 +++---
source4/lib/messaging/wscript_build | 2 +-
source4/lib/policy/wscript_build | 2 +-
source4/lib/registry/wscript_build | 10 ++--
source4/lib/samba3/wscript_build | 4 +-
source4/lib/socket/wscript_build | 4 +-
source4/lib/tls/wscript | 2 +-
source4/lib/wmi/wscript_build | 2 +-
source4/libcli/ldap/wscript_build | 4 +-
source4/libcli/security/wscript_build | 12 +++---
source4/libcli/wbclient/wscript_build | 2 +-
source4/libcli/wscript_build | 14 +++---
source4/libnet/wscript_build | 8 ++--
source4/librpc/wscript_build | 32 +++++++-------
source4/nbt_server/wscript_build | 6 +-
source4/param/wscript_build | 12 +++---
source4/rpc_server/wscript_build | 8 ++--
source4/scripting/python/wscript_build | 2 +-
source4/smbd/wscript_build | 4 +-
source4/torture/drs/wscript_build | 2 +-
source4/torture/local/wscript_build | 2 +-
source4/torture/winbind/wscript_build | 2 +-
source4/torture/wscript_build | 16 +++---
source4/utils/net/wscript_build | 2 +-
source4/utils/wscript_build | 2 +-
source4/winbind/wscript_build | 4 +-
55 files changed, 218 insertions(+), 218 deletions(-)
rename source4/lib/ldb/{pyldb.pc.in => pyldb-util.pc.in} (94%)
Changeset truncated at 500 lines:
diff --git a/lib/tdr/wscript_build b/lib/tdr/wscript_build
index a28c601..627bfec 100644
--- a/lib/tdr/wscript_build
+++ b/lib/tdr/wscript_build
@@ -4,7 +4,7 @@
bld.SAMBA_SUBSYSTEM('TDR',
source='tdr.c',
autoproto='tdr_proto.h',
- public_deps='talloc LIBSAMBA-UTIL',
+ public_deps='talloc libsamba-util',
public_headers='tdr.h'
)
diff --git a/lib/torture/wscript_build b/lib/torture/wscript_build
index a3ba605..b758248 100644
--- a/lib/torture/wscript_build
+++ b/lib/torture/wscript_build
@@ -4,6 +4,6 @@ bld.SAMBA_LIBRARY('torture',
source='torture.c subunit.c',
vnum='0.0.1',
pc_files='torture.pc',
- public_deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBSAMBA-ERRORS talloc
tevent subunit',
+ public_deps='libsamba-hostconfig libsamba-util libsamba-errors talloc
tevent subunit',
public_headers='torture.h'
)
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index aacd415..de84d4e 100644
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('LIBSAMBA-UTIL',
+bld.SAMBA_LIBRARY('libsamba-util',
source='xfile.c debug.c fault.c signal.c system.c time.c genrand.c
dprintf.c util_str.c rfc1738.c substitute.c util_strlist.c util_file.c
data_blob.c util.c blocking.c util_net.c fsusage.c ms_fnmatch.c mutex.c
idtree.c become_daemon.c rbtree.c talloc_stack.c smb_threads.c params.c
parmlist.c util_id.c select.c',
public_deps='talloc LIBCRYPTO CHARSET execinfo uid_wrapper',
public_headers='attr.h byteorder.h data_blob.h debug.h memory.h mutex.h
safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h',
diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index 2bfb92a..24b04c4 100644
--- a/libcli/auth/wscript_build
+++ b/libcli/auth/wscript_build
@@ -2,7 +2,7 @@
bld.SAMBA_SUBSYSTEM('ntlm_check',
source='ntlm_check.c',
- deps='LIBSAMBA-UTIL'
+ deps='libsamba-util'
)
diff --git a/libcli/cldap/wscript_build b/libcli/cldap/wscript_build
index 5def749..2965322 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',
- deps='LIBTSOCKET LIBSAMBA-UTIL UTIL_TEVENT ldb LIBCLI_NETLOGON'
+ public_deps='cli_ldap',
+ deps='LIBTSOCKET libsamba-util UTIL_TEVENT ldb LIBCLI_NETLOGON'
)
diff --git a/libcli/ldap/wscript_build b/libcli/ldap/wscript_build
index d3b8446..d9030c0 100644
--- a/libcli/ldap/wscript_build
+++ b/libcli/ldap/wscript_build
@@ -2,16 +2,16 @@
bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_MESSAGE',
source='ldap_message.c',
- public_deps='LIBSAMBA-ERRORS talloc ldb',
+ public_deps='libsamba-errors talloc ldb',
public_headers='ldap_message.h ldap_errors.h',
- deps='LIBSAMBA-UTIL ASN1_UTIL'
+ deps='libsamba-util ASN1_UTIL'
)
bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_NDR',
source='ldap_ndr.c',
- public_deps='LIBSAMBA-ERRORS talloc',
+ public_deps='libsamba-errors talloc',
public_headers='ldap_ndr.h',
- deps='LIBSAMBA-UTIL ldb NDR_SECURITY tevent'
+ deps='libsamba-util ldb NDR_SECURITY tevent'
)
diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index a39f835..ec2b473 100644
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -7,9 +7,9 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
)
-bld.SAMBA_LIBRARY('LIBCLI_NBT',
+bld.SAMBA_LIBRARY('cli_nbt',
source='lmhosts.c nbtsocket.c namequery.c nameregister.c namerefresh.c
namerelease.c dns_hosts_file.c',
- public_deps='LIBNDR NDR_NBT tevent UTIL_TEVENT NDR_SECURITY
samba_socket LIBSAMBA-UTIL',
+ public_deps='LIBNDR NDR_NBT tevent UTIL_TEVENT NDR_SECURITY
samba_socket libsamba-util',
private_library=True
)
@@ -17,7 +17,7 @@ bld.SAMBA_LIBRARY('LIBCLI_NBT',
bld.SAMBA_BINARY('nmblookup',
source='tools/nmblookup.c',
manpages='man/nmblookup.1',
- deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBCLI_NBT popt POPT_SAMBA
libnetif LIBCLI_RESOLVE'
+ deps='libsamba-hostconfig libsamba-util cli_nbt popt POPT_SAMBA
libnetif LIBCLI_RESOLVE'
)
@@ -29,13 +29,13 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON',
bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON',
source='../netlogon.c',
- public_deps='LIBSAMBA-UTIL LIBCLI_NDR_NETLOGON'
+ public_deps='libsamba-util LIBCLI_NDR_NETLOGON'
)
bld.SAMBA_PYTHON('python_netbios',
source='pynbt.c',
- public_deps='LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG',
+ public_deps='cli_nbt DYNCONFIG libsamba-hostconfig',
realname='samba/netbios.so'
)
diff --git a/libcli/security/wscript_build b/libcli/security/wscript_build
index 97c6785..ddf679c 100644
--- a/libcli/security/wscript_build
+++ b/libcli/security/wscript_build
@@ -1,7 +1,7 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('LIBSECURITY',
+bld.SAMBA_LIBRARY('libsecurity',
source='dom_sid.c display_sec.c secace.c secacl.c
security_descriptor.c sddl.c privileges.c security_token.c access_check.c
object_tree.c create_descriptor.c util_sid.c',
private_library=True,
deps='talloc LIBNDR NDR_SECURITY'
diff --git a/libgpo/wscript_build b/libgpo/wscript_build
index 06b037f..e2fe711 100644
--- a/libgpo/wscript_build
+++ b/libgpo/wscript_build
@@ -2,7 +2,7 @@
bld.SAMBA_SUBSYSTEM('LIBGPO',
source='gpo_util.c gpo_sec.c ../libgpo/gpext/gpext.c gpo_fetch.c
gpo_ini.c ../source4/libgpo/ads_convenience.c ../source3/libgpo/gpo_filesync.c
../source4/libgpo/gpo_filesync.c',
- deps='ldb LIBSAMBA-NET',
+ deps='ldb libsamba-net',
enabled=False
)
diff --git a/librpc/wscript_build b/librpc/wscript_build
index 995382d..8124053 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -249,7 +249,7 @@ bld.SAMBA_SUBSYSTEM('NDR_INITSHUTDOWN',
bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
source='../librpc/ndr/ndr_compression.c',
- public_deps='LIBSAMBA-ERRORS LIBNDR',
+ public_deps='libsamba-errors LIBNDR',
deps='ZLIB LZXPRESS'
)
@@ -479,17 +479,17 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_KEYSVC',
)
# a grouping library for NDR subsystems that may be used by more than one
target
-bld.SAMBA_LIBRARY('NDR_SAMBA',
- source=[],
- deps='NDR_DRSBLOBS NDR_DRSUAPI NDR_IDMAP NDR_NTLMSSP
NDR_SCHANNEL NDR_MGMT NDR_KRB5PAC NDR_DNSP NDR_EPMAPPER NDR_XATTR NDR_UNIXINFO
NDR_NAMED_PIPE_AUTH',
- private_library=True,
- grouping_library=True
- )
+bld.SAMBA_LIBRARY('ndr_samba',
+ source=[],
+ deps='NDR_DRSBLOBS NDR_DRSUAPI NDR_IDMAP NDR_NTLMSSP NDR_SCHANNEL
NDR_MGMT NDR_KRB5PAC NDR_DNSP NDR_EPMAPPER NDR_XATTR NDR_UNIXINFO
NDR_NAMED_PIPE_AUTH',
+ private_library=True,
+ grouping_library=True
+ )
# a grouping library for RPC_NDR subsystems that may be used by more than one
target
-bld.SAMBA_LIBRARY('RPC_NDR_SAMBA',
- source=[],
- deps='RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_WINREG',
- private_library=True,
- grouping_library=True
- )
+bld.SAMBA_LIBRARY('rpc_ndr_samba',
+ source=[],
+ deps='RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_WINREG',
+ private_library=True,
+ grouping_library=True
+ )
diff --git a/nsswitch/libwbclient/wscript_build
b/nsswitch/libwbclient/wscript_build
index b6b3ec9..6e01b1b 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 5468d92..6837f5e 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -1,34 +1,34 @@
#!/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',
source='nsstest.c',
- deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG'
+ deps='libsamba-util libsamba-hostconfig'
)
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/source3/wscript_build b/source3/wscript_build
index 649b30e..3abcd17 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1049,7 +1049,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
bld.SAMBA_SUBSYSTEM('LIBS',
source=LIB_SRC,
- deps='iconv LIBCRYPTO LIBNDR LIBSECURITY NDR_SECURITY
charset NDR_MESSAGING',
+ deps='iconv LIBCRYPTO LIBNDR libsecurity NDR_SECURITY
charset NDR_MESSAGING',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
@@ -1213,29 +1213,29 @@ bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
source='../librpc/gen_ndr/ndr_dcerpc.c',
vars=locals())
-bld.SAMBA_SUBSYSTEM('LIBSAMBA-ERRORS',
- source='../libcli/util/doserr.c libsmb/nterr.c')
+bld.SAMBA_SUBSYSTEM('libsamba-errors',
+ source='../libcli/util/doserr.c libsmb/nterr.c')
bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
- source='../libcli/nbt/nbtname.c',
- deps='talloc',
- autoproto='nbtname.h')
+ source='../libcli/nbt/nbtname.c',
+ deps='talloc',
+ autoproto='nbtname.h')
bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON',
- source='../libcli/ndr_netlogon.c',
- public_deps='LIBNDR NDR_SECURITY')
+ source='../libcli/ndr_netlogon.c',
+ public_deps='LIBNDR NDR_SECURITY')
bld.SAMBA_SUBSYSTEM('RPCCLI_WINREG',
- source='../librpc/gen_ndr/cli_winreg.c',
- public_deps='RPC_NDR_WINREG')
+ source='../librpc/gen_ndr/cli_winreg.c',
+ public_deps='RPC_NDR_WINREG')
bld.SAMBA_SUBSYSTEM('RPCCLI_ECHO',
- source='../librpc/gen_ndr/cli_echo.c',
- public_deps='RPC_NDR_ECHO')
+ source='../librpc/gen_ndr/cli_echo.c',
+ public_deps='RPC_NDR_ECHO')
bld.SAMBA_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
- source=RPC_CLIENT_SCHANNEL_SRC,
- vars=locals())
+ source=RPC_CLIENT_SCHANNEL_SRC,
+ vars=locals())
########################## BINARIES #################################
diff --git a/source4/auth/credentials/wscript_build
b/source4/auth/credentials/wscript_build
index be004a8..14ba67b 100644
--- a/source4/auth/credentials/wscript_build
+++ b/source4/auth/credentials/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_SUBSYSTEM('CREDENTIALS',
source='credentials.c',
autoproto='credentials_proto.h',
public_headers='credentials.h',
- deps='LIBCRYPTO LIBSAMBA-ERRORS libevents LIBCLI_AUTH LIBSECURITY',
+ deps='LIBCRYPTO libsamba-errors libevents LIBCLI_AUTH libsecurity',
)
bld.SAMBA_SUBSYSTEM('CREDENTIALS_KRB5',
diff --git a/source4/auth/gensec/wscript_build
b/source4/auth/gensec/wscript_build
index a1c3257..679c813 100644
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('gensec',
source='gensec.c socket.c gensec_tstream.c',
pc_files='gensec.pc',
autoproto='gensec_proto.h',
- public_deps='UTIL_TEVENT LIBSAMBA-UTIL LIBSAMBA-ERRORS LIBPACKET
auth_system_session',
+ public_deps='UTIL_TEVENT libsamba-util libsamba-errors LIBPACKET
auth_system_session',
public_headers='gensec.h',
deps='com_err',
vnum='0.0.1'
diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index 20d914c..bbb47d7 100644
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_MODULE('auth_sam_module',
source='auth_sam.c',
subsystem='auth',
init_function='auth_sam_init',
- deps='SAMDB auth_sam ntlm_check LIBSAMBA-HOSTCONFIG'
+ deps='SAMDB auth_sam ntlm_check libsamba-hostconfig'
)
@@ -19,7 +19,7 @@ bld.SAMBA_MODULE('auth_server',
source='auth_server.c',
subsystem='auth',
init_function='auth_server_init',
- deps='LIBSAMBA-UTIL LIBCLI_SMB CREDENTIALS_NTLM'
+ deps='libsamba-util LIBCLI_SMB CREDENTIALS_NTLM'
)
@@ -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'
)
@@ -53,11 +53,11 @@ bld.SAMBA_SUBSYSTEM('PAM_ERRORS',
bld.SAMBA_LIBRARY('auth',
- source='auth.c auth_util.c auth_simple.c',
- autoproto='auth_proto.h',
- deps='LIBSAMBA-UTIL LIBSECURITY SAMDB CREDENTIALS
UTIL_TEVENT',
- private_library=True
- )
+ source='auth.c auth_util.c auth_simple.c',
+ autoproto='auth_proto.h',
+ deps='libsamba-util libsecurity SAMDB CREDENTIALS UTIL_TEVENT',
+ private_library=True
+ )
bld.SAMBA_MODULE('auth_server_service',
source='auth_server_service.c',
diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build
index e44a032..03812f5 100644
--- a/source4/auth/wscript_build
+++ b/source4/auth/wscript_build
@@ -33,7 +33,7 @@ bld.SAMBA_SUBSYSTEM('auth_system_session',
bld.SAMBA_SUBSYSTEM('auth_sam',
source='sam.c',
autoproto='auth_sam.h',
- public_deps='SAMDB LIBSECURITY ldb tevent',
+ public_deps='SAMDB libsecurity ldb tevent',
deps=''
)
diff --git a/source4/client/wscript_build b/source4/client/wscript_build
index d35b6a8..a1629de 100644
--- a/source4/client/wscript_build
+++ b/source4/client/wscript_build
@@ -2,12 +2,12 @@
bld.SAMBA_BINARY('smbclient',
source='client.c',
- deps='LIBSAMBA-HOSTCONFIG SMBREADLINE LIBSAMBA-UTIL LIBCLI_SMB
RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_RAW'
+ deps='libsamba-hostconfig SMBREADLINE libsamba-util LIBCLI_SMB
RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_RAW'
)
bld.SAMBA_BINARY('cifsdd',
source='cifsdd.c cifsddio.c',
- deps='LIBSAMBA-HOSTCONFIG LIBCLI_SMB popt POPT_SAMBA POPT_CREDENTIALS'
+ deps='libsamba-hostconfig LIBCLI_SMB popt POPT_SAMBA POPT_CREDENTIALS'
)
diff --git a/source4/dns_server/wscript_build b/source4/dns_server/wscript_build
index 5191480..3a3d6df 100644
--- a/source4/dns_server/wscript_build
+++ b/source4/dns_server/wscript_build
@@ -4,6 +4,6 @@ bld.SAMBA_MODULE('DNS',
source='dns_server.c dns_query.c dns_update.c dns_utils.c',
subsystem='service',
init_function='server_service_dns_init',
- deps='LIBSAMBA-HOSTCONFIG LIBTSOCKET LIBSAMBA_TSOCKET',
+ deps='libsamba-hostconfig LIBTSOCKET LIBSAMBA_TSOCKET',
local_include=False
)
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build
b/source4/dsdb/samdb/ldb_modules/wscript_build
index 3f56ea3..16be427 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -1,15 +1,15 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('DSDB_MODULE',
- source=[],
- deps='DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA
DSDB_MODULE_HELPER_RIDALLOC',
- private_library=True,
- grouping_library=True)
+bld.SAMBA_LIBRARY('dsdb_module',
+ source=[],
+ deps='DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA
DSDB_MODULE_HELPER_RIDALLOC',
+ private_library=True,
+ grouping_library=True)
bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS',
source='util.c acl_util.c schema_util.c',
autoproto='util_proto.h',
- deps='ldb LIBNDR SAMDB_COMMON LIBSECURITY_SESSION'
+ deps='ldb LIBNDR samdb_common libsecurity_session'
)
bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_RIDALLOC',
@@ -56,7 +56,7 @@ bld.SAMBA_MODULE('ldb_repl_meta_data',
subsystem='ldb',
init_function='LDB_MODULE(repl_meta_data)',
internal_module=False,
- deps='SAMDB talloc libevents LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR
DSDB_MODULE_HELPERS LIBSECURITY_SESSION'
+ deps='SAMDB talloc libevents LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR
DSDB_MODULE_HELPERS libsecurity_session'
)
@@ -119,7 +119,7 @@ bld.SAMBA_MODULE('ldb_samba3sam',
subsystem='ldb',
init_function='LDB_MODULE(samba3sam)',
internal_module=False,
- deps='talloc libevents ldb SMBPASSWD LIBSECURITY NDR_SECURITY'
+ deps='talloc libevents ldb smbpasswd libsecurity NDR_SECURITY'
)
@@ -128,7 +128,7 @@ bld.SAMBA_MODULE('ldb_samba3sid',
subsystem='ldb',
init_function='LDB_MODULE(samba3sid)',
internal_module=False,
- deps='talloc libevents ldb SMBPASSWD LIBSECURITY NDR_SECURITY LDBSAMBA
DSDB_MODULE_HELPERS'
+ deps='talloc libevents ldb libsecurity NDR_SECURITY LDBSAMBA
DSDB_MODULE_HELPERS'
)
--
Samba Shared Repository
