diff options
| -rwxr-xr-x | lib/util/wscript_build | 4 | ||||
| -rwxr-xr-x | libcli/auth/wscript_build | 2 | ||||
| -rwxr-xr-x | source3/wscript_build | 6 | ||||
| -rw-r--r-- | source4/lib/messaging/wscript_build | 2 | ||||
| -rw-r--r-- | source4/ntvfs/common/wscript_build | 2 | ||||
| -rw-r--r-- | source4/param/wscript_build | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 79b9f02050..d50592bd1f 100755 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -47,11 +47,11 @@ bld.SAMBA_LIBRARY('wrap_xattr', ) -bld.SAMBA_LIBRARY('UTIL_TDB', +bld.SAMBA_LIBRARY('util_tdb', source='util_tdb.c', local_include=False, public_deps='tdb_compat talloc', - private_library=True + private_library=True ) bld.SAMBA_LIBRARY('tevent-util', diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build index 893cfd9d95..092d5e4b13 100755 --- a/libcli/auth/wscript_build +++ b/libcli/auth/wscript_build @@ -25,7 +25,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_AUTH', bld.SAMBA_SUBSYSTEM('COMMON_SCHANNEL', source='schannel_state_tdb.c schannel_sign.c', - deps='tdb-wrap UTIL_TDB samba-hostconfig NDR_NETLOGON' + deps='tdb-wrap util_tdb samba-hostconfig NDR_NETLOGON' ) diff --git a/source3/wscript_build b/source3/wscript_build index dc0175090b..91ea293623 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -749,7 +749,7 @@ bld.SAMBA3_SUBSYSTEM('REG_API_REGF', bld.SAMBA3_LIBRARY('smbregistry', source=REG_BASE_SRC, - deps='''smbd_shim tdb-wrap3 NDR_SECURITY UTIL_TDB talloc + deps='''smbd_shim tdb-wrap3 NDR_SECURITY util_tdb talloc replace util_reg samba-util security errors3 dbwrap samba3-util''', allow_undefined_symbols=True, @@ -783,7 +783,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_SUBSYSTEM('samba3util', source=LIB_UTIL_SRC, - deps='ndr security NDR_SECURITY samba-util UTIL_TDB ccan', + deps='ndr security NDR_SECURITY samba-util util_tdb ccan', vars=locals()) bld.SAMBA3_SUBSYSTEM('pidfile', @@ -1063,7 +1063,7 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3', bld.SAMBA3_LIBRARY('dbwrap', source='lib/dbwrap/dbwrap.c lib/dbwrap/dbwrap_util.c lib/dbwrap/dbwrap_rbt.c lib/dbwrap/dbwrap_cache.c lib/dbwrap/dbwrap_tdb.c', - deps='samba-util UTIL_TDB errors tdb tdb-wrap', + deps='samba-util util_tdb errors tdb tdb-wrap', private_library=True) bld.SAMBA3_LIBRARY('samba3-util', diff --git a/source4/lib/messaging/wscript_build b/source4/lib/messaging/wscript_build index b7d4fed95e..38f1fab331 100644 --- a/source4/lib/messaging/wscript_build +++ b/source4/lib/messaging/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_SUBSYSTEM('MESSAGING', source='messaging.c', - public_deps='samba-util tdb-wrap NDR_IRPC UNIX_PRIVS UTIL_TDB cluster ndr samba_socket dcerpc' + public_deps='samba-util tdb-wrap NDR_IRPC UNIX_PRIVS util_tdb cluster ndr samba_socket dcerpc' ) diff --git a/source4/ntvfs/common/wscript_build b/source4/ntvfs/common/wscript_build index b16f8fa256..b144472a49 100644 --- a/source4/ntvfs/common/wscript_build +++ b/source4/ntvfs/common/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_SUBSYSTEM('ntvfs_common', source='init.c brlock.c brlock_tdb.c opendb.c opendb_tdb.c notify.c', autoproto='proto.h', - deps='UTIL_TDB tdb-wrap', + deps='util_tdb tdb-wrap', public_deps='NDR_OPENDB NDR_NOTIFY sys_notify sys_lease share' ) diff --git a/source4/param/wscript_build b/source4/param/wscript_build index 80b2758766..4585a83199 100644 --- a/source4/param/wscript_build +++ b/source4/param/wscript_build @@ -32,7 +32,7 @@ bld.SAMBA_MODULE('share_ldb', bld.SAMBA_SUBSYSTEM('SECRETS', source='secrets.c', - deps='ldb tdb-wrap UTIL_TDB NDR_SECURITY tevent ldbwrap' + deps='ldb tdb-wrap util_tdb NDR_SECURITY tevent ldbwrap' ) |