From 833480d3ad1c4b3a1ea74fd583672c65c0af6463 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 23 Oct 2010 16:05:50 -0700 Subject: s4: Rename LIBSAMBA-* to libsamba-* --- source4/lib/cmdline/wscript_build | 4 ++-- source4/lib/com/wscript_build | 2 +- source4/lib/events/wscript_build | 2 +- source4/lib/messaging/wscript_build | 2 +- source4/lib/policy/wscript_build | 2 +- source4/lib/registry/wscript_build | 10 +++++----- source4/lib/samba3/wscript_build | 2 +- source4/lib/socket/wscript_build | 4 ++-- source4/lib/tls/wscript | 2 +- source4/lib/wmi/wscript_build | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) (limited to 'source4/lib') diff --git a/source4/lib/cmdline/wscript_build b/source4/lib/cmdline/wscript_build index 6ef84ce297..fbcf9682fb 100644 --- a/source4/lib/cmdline/wscript_build +++ b/source4/lib/cmdline/wscript_build @@ -11,13 +11,13 @@ bld.SAMBA_SUBSYSTEM('POPT_SAMBA', public_deps='popt', public_headers='popt_common.h:popt.h', header_path='samba', - deps='talloc LIBSAMBA-HOSTCONFIG' + deps='talloc libsamba-hostconfig' ) bld.SAMBA_SUBSYSTEM('POPT_CREDENTIALS', source='popt_credentials.c', autoproto='popt_credentials.h', public_deps='CREDENTIALS CREDENTIALS_SECRETS LIBCMDLINE_CREDENTIALS popt', - deps='LIBSAMBA-UTIL' + deps='libsamba-util' ) diff --git a/source4/lib/com/wscript_build b/source4/lib/com/wscript_build index 4061f28457..857383a220 100644 --- a/source4/lib/com/wscript_build +++ b/source4/lib/com/wscript_build @@ -2,7 +2,7 @@ bld.SAMBA_SUBSYSTEM('COM', source='tables.c rot.c main.c', - deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG libevents LIBNDR PIDL_DCOM' + deps='libsamba-util libsamba-hostconfig libevents LIBNDR PIDL_DCOM' ) diff --git a/source4/lib/events/wscript_build b/source4/lib/events/wscript_build index 559f844acc..7d8774cfc2 100644 --- a/source4/lib/events/wscript_build +++ b/source4/lib/events/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_LIBRARY('libevents', source='tevent_s4.c', - deps='LIBSAMBA-UTIL', + deps='libsamba-util', public_deps='tevent', private_library=True ) diff --git a/source4/lib/messaging/wscript_build b/source4/lib/messaging/wscript_build index cddf76e8a0..7eb26127b6 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='LIBSAMBA-UTIL TDB_WRAP NDR_IRPC UNIX_PRIVS UTIL_TDB CLUSTER LIBNDR samba_socket dcerpc' + public_deps='libsamba-util TDB_WRAP NDR_IRPC UNIX_PRIVS UTIL_TDB CLUSTER LIBNDR samba_socket dcerpc' ) diff --git a/source4/lib/policy/wscript_build b/source4/lib/policy/wscript_build index 3daa91e007..25a700c8c1 100644 --- a/source4/lib/policy/wscript_build +++ b/source4/lib/policy/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_LIBRARY('policy', source='gp_ldap.c gp_filesys.c gp_manage.c gp_ini.c', pc_files='policy.pc', - public_deps='ldb LIBSAMBA-NET', + public_deps='ldb libsamba-net', public_headers='policy.h', vnum='0.0.1', pyembed=True diff --git a/source4/lib/registry/wscript_build b/source4/lib/registry/wscript_build index 592d387a2e..b1e588c723 100644 --- a/source4/lib/registry/wscript_build +++ b/source4/lib/registry/wscript_build @@ -13,7 +13,7 @@ bld.SAMBA_SUBSYSTEM('TDR_REGF', bld.SAMBA_LIBRARY('registry', source='interface.c ../../../libcli/registry/util_reg.c util.c samba.c patchfile_dotreg.c patchfile_preg.c patchfile.c regf.c hive.c local.c ldb.c dir.c rpc.c', pc_files='registry.pc', - public_deps='LIBSAMBA-UTIL CHARSET TDR_REGF ldb RPC_NDR_WINREG LDBSAMBA', + public_deps='libsamba-util CHARSET TDR_REGF ldb RPC_NDR_WINREG LDBSAMBA', public_headers='registry.h', vnum='0.0.1' ) @@ -29,28 +29,28 @@ bld.SAMBA_SUBSYSTEM('registry_common', bld.SAMBA_BINARY('regdiff', source='tools/regdiff.c', manpages='man/regdiff.1', - deps='LIBSAMBA-HOSTCONFIG registry popt POPT_SAMBA POPT_CREDENTIALS' + deps='libsamba-hostconfig registry popt POPT_SAMBA POPT_CREDENTIALS' ) bld.SAMBA_BINARY('regpatch', source='tools/regpatch.c', manpages='man/regpatch.1', - deps='LIBSAMBA-HOSTCONFIG registry popt POPT_SAMBA POPT_CREDENTIALS registry_common' + deps='libsamba-hostconfig registry popt POPT_SAMBA POPT_CREDENTIALS registry_common' ) bld.SAMBA_BINARY('regshell', source='tools/regshell.c', manpages='man/regshell.1', - deps='LIBSAMBA-HOSTCONFIG popt registry POPT_SAMBA POPT_CREDENTIALS SMBREADLINE registry_common' + deps='libsamba-hostconfig popt registry POPT_SAMBA POPT_CREDENTIALS SMBREADLINE registry_common' ) bld.SAMBA_BINARY('regtree', source='tools/regtree.c', manpages='man/regtree.1', - deps='LIBSAMBA-HOSTCONFIG popt registry POPT_SAMBA POPT_CREDENTIALS registry_common' + deps='libsamba-hostconfig popt registry POPT_SAMBA POPT_CREDENTIALS registry_common' ) diff --git a/source4/lib/samba3/wscript_build b/source4/lib/samba3/wscript_build index 699d150693..d727cbb3b0 100644 --- a/source4/lib/samba3/wscript_build +++ b/source4/lib/samba3/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_LIBRARY('SMBPASSWD', source='smbpasswd.c', - deps='CHARSET LIBSAMBA-UTIL', + deps='CHARSET libsamba-util', private_library=True ) diff --git a/source4/lib/socket/wscript_build b/source4/lib/socket/wscript_build index 6aa0481115..7fded7bc88 100644 --- a/source4/lib/socket/wscript_build +++ b/source4/lib/socket/wscript_build @@ -3,14 +3,14 @@ bld.SAMBA_LIBRARY('libnetif', source='interface.c netif.c', autoproto='netif_proto.h', - deps='LIBSAMBA-UTIL', + deps='libsamba-util', private_library=True ) bld.SAMBA_MODULE('socket_ip', source='socket_ip.c', subsystem='samba_socket', - deps='LIBSAMBA-ERRORS', + deps='libsamba-errors', internal_module=True ) diff --git a/source4/lib/tls/wscript b/source4/lib/tls/wscript index d18b82c1aa..d99b625194 100644 --- a/source4/lib/tls/wscript +++ b/source4/lib/tls/wscript @@ -49,5 +49,5 @@ def configure(conf): def build(bld): bld.SAMBA_SUBSYSTEM('LIBTLS', source='tls.c tlscert.c tls_tstream.c', - public_deps='talloc gnutls gcrypt LIBSAMBA-HOSTCONFIG samba_socket LIBTSOCKET tevent UTIL_TEVENT' + public_deps='talloc gnutls gcrypt libsamba-hostconfig samba_socket LIBTSOCKET tevent UTIL_TEVENT' ) diff --git a/source4/lib/wmi/wscript_build b/source4/lib/wmi/wscript_build index 5ab327f2f8..d0042a5de8 100644 --- a/source4/lib/wmi/wscript_build +++ b/source4/lib/wmi/wscript_build @@ -21,6 +21,6 @@ bld.SAMBA_BINARY('wmis', bld.SAMBA_PYTHON('pywmi', source='wmi_wrap.c', - public_deps='LIBCLI_SMB LIBNDR LIBSAMBA-UTIL LIBSAMBA-CONFIG WMI' + public_deps='LIBCLI_SMB LIBNDR libsamba-util libsamba-config WMI' ) -- cgit