From 8cf61377aa388724150699618f5cd60682ffde37 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 24 Oct 2010 10:42:58 -0700 Subject: waf: Remove lib prefix from libraries manually. --- 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/messaging/wscript_build | 2 +- source4/lib/registry/wscript_build | 10 +++++----- source4/lib/samba3/wscript_build | 2 +- source4/lib/socket/wscript_build | 2 +- source4/lib/tls/wscript | 2 +- source4/lib/wmi/wscript_build | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) (limited to 'source4/lib') diff --git a/source4/lib/cmdline/wscript_build b/source4/lib/cmdline/wscript_build index fbcf9682fb..d3b457994b 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 samba-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='samba-util' ) diff --git a/source4/lib/com/wscript_build b/source4/lib/com/wscript_build index 24fbad00ea..3b8b0a1468 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 events LIBNDR PIDL_DCOM' + deps='samba-util samba-hostconfig events ndr PIDL_DCOM' ) diff --git a/source4/lib/events/wscript_build b/source4/lib/events/wscript_build index fa7030b51d..d08d5dda0e 100644 --- a/source4/lib/events/wscript_build +++ b/source4/lib/events/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_LIBRARY('events', source='tevent_s4.c', - deps='libsamba-util', + deps='samba-util', public_deps='tevent', private_library=True ) diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build index 5a2dc70330..adfd949fcb 100644 --- a/source4/lib/ldb-samba/wscript_build +++ b/source4/lib/ldb-samba/wscript_build @@ -9,7 +9,7 @@ bld.SAMBA_SUBSYSTEM('LDBSAMBA', autoproto='ldif_handlers_proto.h', public_deps='ldb', public_headers='ldb_wrap.h', - deps='security LIBNDR NDR_DRSBLOBS CREDENTIALS NDR_DNSP SAMDB' + deps='security ndr NDR_DRSBLOBS CREDENTIALS NDR_DNSP SAMDB' ) diff --git a/source4/lib/messaging/wscript_build b/source4/lib/messaging/wscript_build index 465a90b264..806dcee95f 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='samba-util TDB_WRAP NDR_IRPC UNIX_PRIVS UTIL_TDB CLUSTER ndr samba_socket dcerpc' ) diff --git a/source4/lib/registry/wscript_build b/source4/lib/registry/wscript_build index b1e588c723..f596cce349 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='samba-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='samba-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='samba-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='samba-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='samba-hostconfig popt registry POPT_SAMBA POPT_CREDENTIALS registry_common' ) diff --git a/source4/lib/samba3/wscript_build b/source4/lib/samba3/wscript_build index 882974a257..2e47a15eaa 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 samba-util', private_library=True ) diff --git a/source4/lib/socket/wscript_build b/source4/lib/socket/wscript_build index a9afb1013a..e2ff9b078a 100644 --- a/source4/lib/socket/wscript_build +++ b/source4/lib/socket/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_LIBRARY('netif', source='interface.c netif.c', autoproto='netif_proto.h', - deps='libsamba-util', + deps='samba-util', private_library=True ) diff --git a/source4/lib/tls/wscript b/source4/lib/tls/wscript index d99b625194..b31b692298 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 samba-hostconfig samba_socket LIBTSOCKET tevent UTIL_TEVENT' ) diff --git a/source4/lib/wmi/wscript_build b/source4/lib/wmi/wscript_build index d0042a5de8..59e0ce584a 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 ndr samba-util samba-config WMI' ) -- cgit