From 8cf61377aa388724150699618f5cd60682ffde37 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 24 Oct 2010 10:42:58 -0700 Subject: [PATCH] waf: Remove lib prefix from libraries manually. --- buildtools/wafsamba/wafsamba.py | 2 - lib/tdr/wscript_build | 2 +- lib/torture/wscript_build | 2 +- lib/util/wscript_build | 2 +- libcli/auth/wscript_build | 2 +- libcli/cldap/wscript_build | 2 +- libcli/ldap/wscript_build | 4 +- libcli/nbt/wscript_build | 10 +- libcli/security/wscript_build | 2 +- librpc/wscript_build | 110 +++++++++---------- nsswitch/wscript_build | 4 +- source3/librpc/wscript_build | 16 +-- source3/wscript_build | 22 ++-- source4/auth/gensec/wscript_build | 4 +- source4/auth/kerberos/wscript_build | 2 +- source4/auth/ntlm/wscript_build | 6 +- source4/client/wscript_build | 4 +- source4/dns_server/wscript_build | 2 +- source4/dsdb/samdb/ldb_modules/wscript_build | 40 +++---- source4/dsdb/wscript_build | 4 +- source4/heimdal_build/wscript_build | 2 +- source4/kdc/wscript_build | 12 +- 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/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 +- source4/libcli/ldap/wscript_build | 2 +- source4/libcli/wscript_build | 6 +- source4/libnet/wscript_build | 2 +- source4/librpc/wscript_build | 50 ++++----- source4/nbt_server/wscript_build | 2 +- source4/ntvfs/posix/wscript_build | 4 +- source4/param/wscript_build | 12 +- source4/rpc_server/wscript_build | 4 +- source4/scripting/python/wscript_build | 4 +- source4/smbd/wscript_build | 4 +- source4/torture/wscript_build | 6 +- source4/utils/net/wscript_build | 2 +- source4/utils/wscript_build | 2 +- 46 files changed, 193 insertions(+), 195 deletions(-) diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 8e215de9948..9682e2c29c8 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -176,8 +176,6 @@ def SAMBA_LIBRARY(bld, libname, source, if target_type == 'PYTHON' or realname or not private_library: # Sanitize the library name bundled_name = libname.lower().replace('_', '-') - while bundled_name.startswith("lib"): - bundled_name = bundled_name[3:] else: bundled_name = PRIVATE_NAME(bld, libname, bundled_extension, private_library) diff --git a/lib/tdr/wscript_build b/lib/tdr/wscript_build index 627bfecadab..431ac53949f 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 samba-util', public_headers='tdr.h' ) diff --git a/lib/torture/wscript_build b/lib/torture/wscript_build index 4719ba79c68..a68707a3a0d 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 errors talloc tevent subunit', + public_deps='samba-hostconfig samba-util errors talloc tevent subunit', public_headers='torture.h' ) diff --git a/lib/util/wscript_build b/lib/util/wscript_build index de84d4e5a1d..e032e157d69 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('samba-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 24b04c4a652..712f828e9b7 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='samba-util' ) diff --git a/libcli/cldap/wscript_build b/libcli/cldap/wscript_build index 296532227e8..e52abbe4a97 100644 --- a/libcli/cldap/wscript_build +++ b/libcli/cldap/wscript_build @@ -4,6 +4,6 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_CLDAP', source='cldap.c', public_deps='cli_ldap', - deps='LIBTSOCKET libsamba-util UTIL_TEVENT ldb LIBCLI_NETLOGON' + deps='LIBTSOCKET samba-util UTIL_TEVENT ldb LIBCLI_NETLOGON' ) diff --git a/libcli/ldap/wscript_build b/libcli/ldap/wscript_build index 4d8ebcd6cf1..5efb6838333 100644 --- a/libcli/ldap/wscript_build +++ b/libcli/ldap/wscript_build @@ -4,7 +4,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_MESSAGE', source='ldap_message.c', public_deps='errors talloc ldb', public_headers='ldap_message.h ldap_errors.h', - deps='libsamba-util ASN1_UTIL' + deps='samba-util ASN1_UTIL' ) @@ -12,6 +12,6 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_NDR', source='ldap_ndr.c', public_deps='errors talloc', public_headers='ldap_ndr.h', - deps='libsamba-util ldb NDR_SECURITY tevent' + deps='samba-util ldb NDR_SECURITY tevent' ) diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build index eb1736932a7..ebd822256de 100644 --- a/libcli/nbt/wscript_build +++ b/libcli/nbt/wscript_build @@ -9,7 +9,7 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF', 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='ndr NDR_NBT tevent UTIL_TEVENT NDR_SECURITY samba_socket samba-util', private_library=True ) @@ -17,25 +17,25 @@ bld.SAMBA_LIBRARY('cli_nbt', bld.SAMBA_BINARY('nmblookup', source='tools/nmblookup.c', manpages='man/nmblookup.1', - deps='libsamba-hostconfig libsamba-util cli_nbt popt POPT_SAMBA netif LIBCLI_RESOLVE' + deps='samba-hostconfig samba-util cli_nbt popt POPT_SAMBA netif LIBCLI_RESOLVE' ) bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON', source='../ndr_netlogon.c', - public_deps='LIBNDR NDR_SECURITY' + public_deps='ndr NDR_SECURITY' ) bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON', source='../netlogon.c', - public_deps='libsamba-util LIBCLI_NDR_NETLOGON' + public_deps='samba-util LIBCLI_NDR_NETLOGON' ) bld.SAMBA_PYTHON('python_netbios', source='pynbt.c', - public_deps='cli_nbt DYNCONFIG libsamba-hostconfig', + public_deps='cli_nbt DYNCONFIG samba-hostconfig', realname='samba/netbios.so' ) diff --git a/libcli/security/wscript_build b/libcli/security/wscript_build index f3b03255428..4b3f46ebcfe 100644 --- a/libcli/security/wscript_build +++ b/libcli/security/wscript_build @@ -4,6 +4,6 @@ bld.SAMBA_LIBRARY('security', 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' + deps='talloc ndr NDR_SECURITY' ) diff --git a/librpc/wscript_build b/librpc/wscript_build index 6e73a3d971b..2ff4c3e58f8 100644 --- a/librpc/wscript_build +++ b/librpc/wscript_build @@ -4,82 +4,82 @@ bld.RECURSE('idl') bld.SAMBA_SUBSYSTEM('NDR_AUDIOSRV', source='../librpc/gen_ndr/ndr_audiosrv.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_NAMED_PIPE_AUTH', source='../librpc/gen_ndr/ndr_named_pipe_auth.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_DNSSERVER', source='../librpc/gen_ndr/ndr_dnsserver.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_DNS', source='../librpc/gen_ndr/ndr_dns.c ../librpc/ndr/ndr_dns.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_DSBACKUP', source='../librpc/gen_ndr/ndr_dsbackup.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_DFS', source='../librpc/gen_ndr/ndr_dfs.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_WINREG', source='../librpc/gen_ndr/ndr_winreg.c', - public_deps='LIBNDR NDR_SECURITY NDR_LSA' + public_deps='ndr NDR_SECURITY NDR_LSA' ) bld.SAMBA_SUBSYSTEM('NDR_EFS', source='../librpc/gen_ndr/ndr_efs.c', - public_deps='LIBNDR NDR_SECURITY' + public_deps='ndr NDR_SECURITY' ) bld.SAMBA_SUBSYSTEM('NDR_ROT', source='../librpc/gen_ndr/ndr_rot.c', - public_deps='LIBNDR NDR_ORPC' + public_deps='ndr NDR_ORPC' ) bld.SAMBA_SUBSYSTEM('NDR_FRSRPC', source='../librpc/ndr/ndr_frsrpc.c ../librpc/gen_ndr/ndr_frsrpc.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_FRSAPI', source='../librpc/gen_ndr/ndr_frsapi.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_FRSTRANS', source='../librpc/gen_ndr/ndr_frstrans.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_DFSBLOBS', source='../librpc/gen_ndr/ndr_dfsblobs.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_POLICYAGENT', source='../librpc/gen_ndr/ndr_policyagent.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_UNIXINFO', source='../librpc/gen_ndr/ndr_unixinfo.c', - public_deps='LIBNDR NDR_SECURITY' + public_deps='ndr NDR_SECURITY' ) bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS', source='../librpc/gen_ndr/ndr_spoolss.c', - public_deps='LIBNDR NDR_SPOOLSS_BUF NDR_SECURITY' + public_deps='ndr NDR_SPOOLSS_BUF NDR_SECURITY' ) bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS_BUF', @@ -89,199 +89,199 @@ bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS_BUF', bld.SAMBA_SUBSYSTEM('NDR_EPMAPPER', source='../librpc/gen_ndr/ndr_epmapper.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_DBGIDL', source='../librpc/gen_ndr/ndr_dbgidl.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_DSSETUP', source='../librpc/gen_ndr/ndr_dssetup.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_MSGSVC', source='../librpc/gen_ndr/ndr_msgsvc.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_MGMT', source='../librpc/gen_ndr/ndr_mgmt.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_PROTECTED_STORAGE', source='../librpc/gen_ndr/ndr_protected_storage.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_ORPC', source='../librpc/ndr/ndr_orpc.c ../librpc/gen_ndr/ndr_orpc.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_OXIDRESOLVER', source='../librpc/gen_ndr/ndr_oxidresolver.c', - public_deps='LIBNDR NDR_ORPC' + public_deps='ndr NDR_ORPC' ) bld.SAMBA_SUBSYSTEM('NDR_REMACT', source='../librpc/gen_ndr/ndr_remact.c', - public_deps='LIBNDR NDR_ORPC' + public_deps='ndr NDR_ORPC' ) bld.SAMBA_SUBSYSTEM('NDR_DCOM', source='../librpc/gen_ndr/ndr_dcom.c', - public_deps='LIBNDR NDR_SECURITY NDR_ORPC' + public_deps='ndr NDR_SECURITY NDR_ORPC' ) bld.SAMBA_SUBSYSTEM('NDR_WMI', source='../librpc/ndr/ndr_wmi.c ../librpc/gen_ndr/ndr_wmi.c', - public_deps='LIBNDR NDR_SECURITY NDR_DCOM' + public_deps='ndr NDR_SECURITY NDR_DCOM' ) bld.SAMBA_SUBSYSTEM('NDR_WZCSVC', source='../librpc/gen_ndr/ndr_wzcsvc.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_BROWSER', source='../librpc/gen_ndr/ndr_browser.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_W32TIME', source='../librpc/gen_ndr/ndr_w32time.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_SCERPC', source='../librpc/gen_ndr/ndr_scerpc.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_TRKWKS', source='../librpc/gen_ndr/ndr_trkwks.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_KEYSVC', source='../librpc/gen_ndr/ndr_keysvc.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_RAP', source='../librpc/gen_ndr/ndr_rap.c ../librpc/ndr/ndr_rap.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_IDMAP', source='../librpc/gen_ndr/ndr_idmap.c', - public_deps='LIBNDR NDR_STANDARD' + public_deps='ndr NDR_STANDARD' ) bld.SAMBA_SUBSYSTEM('NDR_NTLMSSP', source='../librpc/ndr/ndr_ntlmssp.c ../librpc/gen_ndr/ndr_ntlmssp.c', - public_deps='LIBNDR NDR_STANDARD' + public_deps='ndr NDR_STANDARD' ) bld.SAMBA_SUBSYSTEM('NDR_DNSP', source='../librpc/gen_ndr/ndr_dnsp.c ../librpc/ndr/ndr_dnsp.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_NTPRINTING', source='../librpc/gen_ndr/ndr_ntprinting.c ../librpc/ndr/ndr_ntprinting.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_SAMR', source='../librpc/gen_ndr/ndr_samr.c', - public_deps='LIBNDR NDR_SECURITY NDR_LSA' + public_deps='ndr NDR_SECURITY NDR_LSA' ) bld.SAMBA_SUBSYSTEM('NDR_LSA', source='../librpc/gen_ndr/ndr_lsa.c', - public_deps='LIBNDR NDR_SECURITY' + public_deps='ndr NDR_SECURITY' ) bld.SAMBA_SUBSYSTEM('NDR_SVCCTL', source='../librpc/gen_ndr/ndr_svcctl.c ../librpc/ndr/ndr_svcctl.c', - public_deps='LIBNDR NDR_SECURITY' + public_deps='ndr NDR_SECURITY' ) bld.SAMBA_SUBSYSTEM('NDR_SRVSVC', source='../librpc/gen_ndr/ndr_srvsvc.c', - public_deps='LIBNDR NDR_SECURITY NDR_SVCCTL' + public_deps='ndr NDR_SECURITY NDR_SVCCTL' ) bld.SAMBA_SUBSYSTEM('NDR_NETLOGON', source='../librpc/gen_ndr/ndr_netlogon.c ../librpc/ndr/ndr_netlogon.c', - public_deps='LIBNDR NDR_SECURITY NDR_LSA NDR_SAMR NDR_NBT' + public_deps='ndr NDR_SECURITY NDR_LSA NDR_SAMR NDR_NBT' ) bld.SAMBA_SUBSYSTEM('NDR_EVENTLOG', source='../librpc/gen_ndr/ndr_eventlog.c', - public_deps='LIBNDR NDR_SECURITY NDR_LSA' + public_deps='ndr NDR_SECURITY NDR_LSA' ) bld.SAMBA_SUBSYSTEM('NDR_NTSVCS', source='../librpc/gen_ndr/ndr_ntsvcs.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_WKSSVC', source='../librpc/gen_ndr/ndr_wkssvc.c', - public_deps='LIBNDR NDR_SECURITY' + public_deps='ndr NDR_SECURITY' ) bld.SAMBA_SUBSYSTEM('NDR_ECHO', source='../librpc/gen_ndr/ndr_echo.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_INITSHUTDOWN', source='../librpc/gen_ndr/ndr_initshutdown.c', - public_deps='LIBNDR NDR_LSA' + public_deps='ndr NDR_LSA' ) bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION', source='../librpc/ndr/ndr_compression.c', - public_deps='errors LIBNDR', + public_deps='errors ndr', deps='ZLIB LZXPRESS' ) bld.SAMBA_SUBSYSTEM('NDR_DRSUAPI', source='../librpc/ndr/ndr_drsuapi.c ../librpc/gen_ndr/ndr_drsuapi.c', - public_deps='LIBNDR NDR_COMPRESSION NDR_SECURITY NDR_STANDARD ASN1_UTIL' + public_deps='ndr NDR_COMPRESSION NDR_SECURITY NDR_STANDARD ASN1_UTIL' ) bld.SAMBA_SUBSYSTEM('NDR_DRSBLOBS', source='../librpc/ndr/ndr_drsblobs.c ../librpc/gen_ndr/ndr_drsblobs.c', - public_deps='LIBNDR NDR_DRSUAPI' + public_deps='ndr NDR_DRSUAPI' ) bld.SAMBA_SUBSYSTEM('NDR_KRB5PAC', source='../librpc/ndr/ndr_krb5pac.c ../librpc/gen_ndr/ndr_krb5pac.c', - public_deps='LIBNDR NDR_STANDARD NDR_SECURITY' + public_deps='ndr NDR_STANDARD NDR_SECURITY' ) bld.SAMBA_SUBSYSTEM('NDR_XATTR', source='../librpc/ndr/ndr_xattr.c ../librpc/gen_ndr/ndr_xattr.c', - public_deps='LIBNDR NDR_SECURITY' + public_deps='ndr NDR_SECURITY' ) bld.SAMBA_SUBSYSTEM('NDR_SCHANNEL', source='../librpc/ndr/ndr_schannel.c ../librpc/gen_ndr/ndr_schannel.c', - public_deps='LIBNDR NDR_NBT' + public_deps='ndr NDR_NBT' ) bld.SAMBA_SUBSYSTEM('NDR_NBT', source='../librpc/gen_ndr/ndr_nbt.c', - public_deps='LIBNDR NDR_NBT_BUF NDR_SECURITY NDR_STANDARD LIBCLI_NDR_NETLOGON', + public_deps='ndr NDR_NBT_BUF NDR_SECURITY NDR_STANDARD LIBCLI_NDR_NETLOGON', public_headers='../librpc/gen_ndr/nbt.h', header_path='gen_ndr' ) diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build index 5146ed95c4e..acb7313a63b 100644 --- a/nsswitch/wscript_build +++ b/nsswitch/wscript_build @@ -10,13 +10,13 @@ bld.SAMBA_LIBRARY('winbind-client', bld.SAMBA_BINARY('nsstest', source='nsstest.c', - deps='libsamba-util libsamba-hostconfig' + deps='samba-util samba-hostconfig' ) bld.SAMBA_BINARY('wbinfo', source='wbinfo.c', - deps='libsamba-util LIBCLI_AUTH popt POPT_SAMBA winbind-client wbclient tevent UTIL_TEVENT LIBASYNC_REQ security LIBNDR NDR_SECURITY' + deps='samba-util LIBCLI_AUTH popt POPT_SAMBA winbind-client wbclient tevent UTIL_TEVENT LIBASYNC_REQ security ndr NDR_SECURITY' ) bld.SAMBA_LIBRARY('nss_winbind', diff --git a/source3/librpc/wscript_build b/source3/librpc/wscript_build index 66713ef2979..0bb73222a70 100644 --- a/source3/librpc/wscript_build +++ b/source3/librpc/wscript_build @@ -2,42 +2,42 @@ bld.SAMBA_SUBSYSTEM('NDR_LIBNETAPI', source='gen_ndr/ndr_libnetapi.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_LIBNET_JOIN', source='gen_ndr/ndr_libnet_join.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_MESSAGING', source='gen_ndr/ndr_messaging.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_NOTIFY', source='gen_ndr/ndr_notify.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_PREG', source='gen_ndr/ndr_preg.c ndr/ndr_preg.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_SECRETS', source='gen_ndr/ndr_secrets.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_PERFCOUNT', source='gen_ndr/ndr_perfcount.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_WBINT', source='gen_ndr/ndr_wbint.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('RPC_NDR_WBINT', diff --git a/source3/wscript_build b/source3/wscript_build index 7068c616210..84d30f8fe7b 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -892,7 +892,7 @@ bld.RECURSE('../libcli/security') bld.SAMBA_SUBSYSTEM('WBCOMMON', source=WBCOMMON_SRC) -bld.SAMBA_LIBRARY('libwbclient', +bld.SAMBA_LIBRARY('wbclient', source='''../nsswitch/libwbclient/wbc_guid.c ../nsswitch/libwbclient/wbc_idmap.c ../nsswitch/libwbclient/wbclient.c @@ -904,7 +904,7 @@ bld.SAMBA_LIBRARY('libwbclient', private_library=True, public_deps='talloc WBCOMMON') -bld.SAMBA_LIBRARY('libnetapi', +bld.SAMBA_LIBRARY('netapi', source=LIBNETAPI_SRC, public_deps='''talloc tdb cap libwbclient LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG @@ -914,7 +914,7 @@ bld.SAMBA_LIBRARY('libnetapi', private_library=True, vars=locals()) -bld.SAMBA_LIBRARY('libsmbclient', +bld.SAMBA_LIBRARY('smbclient', source=LIBSMBCLIENT_SRC, public_deps='''talloc tdb libwbclient cap PARAM LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB LIBMSRPC_GEN LIBMSRPC''', @@ -922,14 +922,14 @@ bld.SAMBA_LIBRARY('libsmbclient', private_library=True, vars=locals()) -bld.SAMBA_LIBRARY('libsmbsharemodes', +bld.SAMBA_LIBRARY('smbsharemodes', source=LIBSMBSHAREMODES_SRC, public_deps='''talloc tdb''', public_headers='include/smb_share_modes.h', private_library=True, vars=locals()) -bld.SAMBA_LIBRARY('libaddns', +bld.SAMBA_LIBRARY('addns', source=LIBADDNS_SRC, public_deps='talloc krb5 k5crypto com_err gssapi gssapi_krb5', private_library=True, @@ -937,7 +937,7 @@ bld.SAMBA_LIBRARY('libaddns', bld.SAMBA_SUBSYSTEM('LIBMSRPC', source='${LIBMSRPC_SRC}', - deps='LIBNDR NDR_SECURITY NDR_DCERPC NDR_SCHANNEL', + deps='ndr NDR_SECURITY NDR_DCERPC NDR_SCHANNEL', vars=locals()) bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN', @@ -1019,7 +1019,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT', bld.SAMBA_SUBSYSTEM('LIBS', source=LIB_SRC, - deps='iconv LIBCRYPTO LIBNDR security NDR_SECURITY charset NDR_MESSAGING', + deps='iconv LIBCRYPTO ndr security NDR_SECURITY charset NDR_MESSAGING', vars=locals()) bld.SAMBA_SUBSYSTEM('LIB_NONSMBD', @@ -1158,7 +1158,7 @@ bld.SAMBA_SUBSYSTEM('DCUTIL', source=DCUTIL_SRC, vars=locals()) -bld.SAMBA_SUBSYSTEM('LIBNDR', +bld.SAMBA_SUBSYSTEM('ndr', source=LIBNDR_SRC, vars=locals()) @@ -1182,14 +1182,14 @@ bld.SAMBA_SUBSYSTEM('LZXPRESS', bld.SAMBA_SUBSYSTEM('NDR_SECURITY', source='''../librpc/gen_ndr/ndr_security.c ../librpc/ndr/ndr_sec_helper.c''', - deps='LIBNDR', + deps='ndr', vars=locals()) bld.SAMBA_SUBSYSTEM('NDR_DCERPC', source='../librpc/gen_ndr/ndr_dcerpc.c', vars=locals()) -bld.SAMBA_SUBSYSTEM('libsamba-errors', +bld.SAMBA_SUBSYSTEM('samba-errors', source='../libcli/util/doserr.c libsmb/nterr.c') bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF', @@ -1199,7 +1199,7 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF', bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON', source='../libcli/ndr_netlogon.c', - public_deps='LIBNDR NDR_SECURITY') + public_deps='ndr NDR_SECURITY') bld.SAMBA_SUBSYSTEM('RPCCLI_WINREG', source='../librpc/gen_ndr/cli_winreg.c', diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build index 7f4a9eee07b..31488911add 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 errors LIBPACKET auth_system_session', + public_deps='UTIL_TEVENT samba-util errors LIBPACKET auth_system_session', public_headers='gensec.h', deps='com_err', vnum='0.0.1' @@ -48,7 +48,7 @@ bld.SAMBA_MODULE('gensec_spnego', bld.SAMBA_MODULE('gensec_schannel', source='schannel.c ../../../libcli/auth/schannel_sign.c', subsystem='gensec', - deps='COMMON_SCHANNELDB NDR_SCHANNEL CREDENTIALS LIBNDR auth_session', + deps='COMMON_SCHANNELDB NDR_SCHANNEL CREDENTIALS ndr auth_session', internal_module=True, autoproto='schannel_proto.h', init_function='gensec_schannel_init' diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build index 8736b24366e..4f0c8ccadd2 100644 --- a/source4/auth/kerberos/wscript_build +++ b/source4/auth/kerberos/wscript_build @@ -4,7 +4,7 @@ bld.SAMBA_SUBSYSTEM('KERBEROS', source='kerberos.c clikrb5.c kerberos_heimdal.c kerberos_pac.c gssapi_parse.c krb5_init_context.c keytab_copy.c', autoproto='proto.h', public_deps='krb5 NDR_KRB5PAC samba_socket LIBCLI_RESOLVE com_err', - deps='ASN1_UTIL auth_sam_reply tevent LIBPACKET LIBNDR' + deps='ASN1_UTIL auth_sam_reply tevent LIBPACKET ndr' ) bld.SAMBA_SUBSYSTEM('KERBEROS_UTIL', diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build index c7e9a899cfe..ef01f09f0a7 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 samba-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='samba-util LIBCLI_SMB CREDENTIALS_NTLM' ) @@ -55,7 +55,7 @@ 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 security SAMDB CREDENTIALS UTIL_TEVENT', + deps='samba-util security SAMDB CREDENTIALS UTIL_TEVENT', private_library=True ) diff --git a/source4/client/wscript_build b/source4/client/wscript_build index a1629de11b3..f5425752653 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='samba-hostconfig SMBREADLINE samba-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='samba-hostconfig LIBCLI_SMB popt POPT_SAMBA POPT_CREDENTIALS' ) diff --git a/source4/dns_server/wscript_build b/source4/dns_server/wscript_build index 3a3d6dfc4f3..cb17f22c801 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='samba-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 b7a44ecf4ff..a5a520c554f 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -9,7 +9,7 @@ bld.SAMBA_LIBRARY('dsdb_module', bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS', source='util.c acl_util.c schema_util.c', autoproto='util_proto.h', - deps='ldb LIBNDR samdb_common security_session' + deps='ldb ndr samdb_common security_session' ) bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_RIDALLOC', @@ -28,7 +28,7 @@ bld.SAMBA_MODULE('ldb_samba_dsdb', source='samba_dsdb.c', subsystem='ldb', init_function='LDB_MODULE(samba_dsdb)', - deps='SAMDB talloc events LIBNDR DSDB_MODULE_HELPERS', + deps='SAMDB talloc events ndr DSDB_MODULE_HELPERS', internal_module=False, ) @@ -38,7 +38,7 @@ bld.SAMBA_MODULE('ldb_samba_secrets', subsystem='ldb', init_function='LDB_MODULE(samba_secrets)', internal_module=False, - deps='SAMDB talloc events LIBNDR' + deps='SAMDB talloc events ndr' ) @@ -47,7 +47,7 @@ bld.SAMBA_MODULE('ldb_objectguid', subsystem='ldb', init_function='LDB_MODULE(objectguid)', internal_module=False, - deps='SAMDB talloc events LIBNDR' + deps='SAMDB talloc events ndr' ) @@ -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 events LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR DSDB_MODULE_HELPERS security_session' + deps='SAMDB talloc events ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS security_session' ) @@ -138,7 +138,7 @@ bld.SAMBA_MODULE('ldb_simple_ldap_map', subsystem='ldb', init_function='LDB_MODULE(entryuuid),LDB_MODULE(nsuniqueid)', internal_module=False, - deps='talloc events ldb LIBNDR LDBSAMBA' + deps='talloc events ldb ndr LDBSAMBA' ) @@ -165,7 +165,7 @@ bld.SAMBA_MODULE('ldb_local_password', subsystem='ldb', init_function='LDB_MODULE(local_password)', internal_module=False, - deps='talloc events LIBNDR SAMDB' + deps='talloc events ndr SAMDB' ) bld.SAMBA_MODULE('ldb_extended_dn_in', @@ -173,7 +173,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_in', subsystem='ldb', init_function='LDB_MODULE(extended_dn_in)', internal_module=False, - deps='talloc events libsamba-util' + deps='talloc events samba-util' ) @@ -181,7 +181,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_out', source='extended_dn_out.c', aliases='ldb_extended_dn_out_ldb ldb_extended_dn_out_openldap ldb_extended_dn_out_fds', subsystem='ldb', - deps='talloc events LIBNDR libsamba-util SAMDB', + deps='talloc events ndr samba-util SAMDB', internal_module=False, init_function='LDB_MODULE(extended_dn_out_ldb),LDB_MODULE(extended_dn_out_openldap),LDB_MODULE(extended_dn_out_fds)' ) @@ -192,7 +192,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_store', subsystem='ldb', init_function='LDB_MODULE(extended_dn_store)', internal_module=False, - deps='talloc events libsamba-util SAMDB DSDB_MODULE_HELPERS' + deps='talloc events samba-util SAMDB DSDB_MODULE_HELPERS' ) @@ -201,7 +201,7 @@ bld.SAMBA_MODULE('ldb_show_deleted', subsystem='ldb', init_function='LDB_MODULE(show_deleted)', internal_module=False, - deps='talloc events libsamba-util DSDB_MODULE_HELPERS' + deps='talloc events samba-util DSDB_MODULE_HELPERS' ) @@ -238,7 +238,7 @@ bld.SAMBA_MODULE('ldb_objectclass', subsystem='ldb', init_function='LDB_MODULE(objectclass)', internal_module=False, - deps='talloc events security NDR_SECURITY SAMDB DSDB_MODULE_HELPERS libsamba-util DSDB_MODULE_HELPER_SCHEMA' + deps='talloc events security NDR_SECURITY SAMDB DSDB_MODULE_HELPERS samba-util DSDB_MODULE_HELPER_SCHEMA' ) @@ -246,7 +246,7 @@ bld.SAMBA_MODULE('ldb_objectclass_attrs', source='objectclass_attrs.c', subsystem='ldb', init_function='LDB_MODULE(objectclass_attrs)', - deps='talloc SAMDB libsamba-util', + deps='talloc SAMDB samba-util', internal_module=False, ) @@ -256,7 +256,7 @@ bld.SAMBA_MODULE('ldb_subtree_rename', subsystem='ldb', init_function='LDB_MODULE(subtree_rename)', internal_module=False, - deps='talloc events libsamba-util ldb samdb_common' + deps='talloc events samba-util ldb samdb_common' ) @@ -265,7 +265,7 @@ bld.SAMBA_MODULE('ldb_subtree_delete', subsystem='ldb', init_function='LDB_MODULE(subtree_delete)', internal_module=False, - deps='talloc events libsamba-util DSDB_MODULE_HELPERS' + deps='talloc events samba-util DSDB_MODULE_HELPERS' ) @@ -283,7 +283,7 @@ bld.SAMBA_MODULE('ldb_ranged_results', subsystem='ldb', init_function='LDB_MODULE(ranged_results)', internal_module=False, - deps='talloc events libsamba-util ldb' + deps='talloc events samba-util ldb' ) @@ -292,7 +292,7 @@ bld.SAMBA_MODULE('ldb_anr', subsystem='ldb', init_function='LDB_MODULE(anr)', internal_module=False, - deps='talloc events libsamba-util SAMDB' + deps='talloc events samba-util SAMDB' ) @@ -301,7 +301,7 @@ bld.SAMBA_MODULE('ldb_instancetype', subsystem='ldb', init_function='LDB_MODULE(instancetype)', internal_module=False, - deps='talloc events libsamba-util SAMDB DSDB_MODULE_HELPERS' + deps='talloc events samba-util SAMDB DSDB_MODULE_HELPERS' ) @@ -310,7 +310,7 @@ bld.SAMBA_MODULE('ldb_operational', subsystem='ldb', init_function='LDB_MODULE(operational)', internal_module=False, - deps='talloc tevent libsamba-util samdb_common DSDB_MODULE_HELPERS auth auth_session' + deps='talloc tevent samba-util samdb_common DSDB_MODULE_HELPERS auth auth_session' ) @@ -328,7 +328,7 @@ bld.SAMBA_MODULE('ldb_resolve_oids', subsystem='ldb', init_function='LDB_MODULE(resolve_oids)', internal_module=False, - deps='SAMDB talloc events LIBNDR' + deps='SAMDB talloc events ndr' ) diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index 616f1f625c2..a7e0895f080 100644 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -6,7 +6,7 @@ bld.SAMBA_LIBRARY('SAMDB', source='samdb/samdb.c samdb/samdb_privilege.c samdb/cracknames.c repl/replicated_objects.c', autoproto='samdb/samdb_proto.h', public_deps='krb5', - deps='LIBNDR NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH LIBNDR SAMDB_SCHEMA LDBSAMBA samdb_common LIBCLI_DRSUAPI LIBCLI_LDAP_NDR libsamba-util com_err KERBEROS CREDENTIALS CREDENTIALS_SECRETS', + deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA LDBSAMBA samdb_common LIBCLI_DRSUAPI LIBCLI_LDAP_NDR samba-util com_err KERBEROS CREDENTIALS CREDENTIALS_SECRETS', vnum='0.0.1' ) @@ -15,7 +15,7 @@ bld.SAMBA_LIBRARY('samdb_common', source='common/util.c common/util_samr.c common/dsdb_dn.c common/dsdb_access.c ../../libds/common/flag_mapping.c', autoproto='common/proto.h', private_library=True, - deps='ldb NDR_DRSBLOBS UTIL_LDB LIBCLI_AUTH libsamba-hostconfig samba_socket LIBCLI_LDAP_NDR' + deps='ldb NDR_DRSBLOBS UTIL_LDB LIBCLI_AUTH samba-hostconfig samba_socket LIBCLI_LDAP_NDR' ) diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index 813d53c67c8..2adf79365da 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -616,7 +616,7 @@ KRB5_SOURCE = [os.path.join('lib/krb5/', x) for x in to_list( HEIMDAL_LIBRARY('krb5', KRB5_SOURCE, includes='../heimdal/lib/krb5 ../heimdal/lib/asn1 ../heimdal/include', - deps='roken HEIMDAL_PKINIT_ASN1 wind HEIMDAL_KRB5_ASN1 hx509 HEIMDAL_HCRYPTO libsamba-hostconfig intl com_err HEIMDAL_CONFIG', + deps='roken HEIMDAL_PKINIT_ASN1 wind HEIMDAL_KRB5_ASN1 hx509 HEIMDAL_HCRYPTO samba-hostconfig intl com_err HEIMDAL_CONFIG', vnum='26.0.0', ) KRB5_PROTO_SOURCE = KRB5_SOURCE + ['lib/krb5/expand_path.c', 'lib/krb5/plugin.c'] diff --git a/source4/kdc/wscript_build b/source4/kdc/wscript_build index 3c9b51d3958..89faffd49ac 100644 --- a/source4/kdc/wscript_build +++ b/source4/kdc/wscript_build @@ -4,14 +4,14 @@ bld.SAMBA_MODULE('KDC', source='kdc.c kpasswdd.c', subsystem='service', init_function='server_service_kdc_init', - deps='kdc HDB_SAMBA4 WDC_SAMBA4 libsamba-hostconfig LIBTSOCKET LIBSAMBA_TSOCKET com_err samba_server_gensec', + deps='kdc HDB_SAMBA4 WDC_SAMBA4 samba-hostconfig LIBTSOCKET LIBSAMBA_TSOCKET com_err samba_server_gensec', local_include=False ) bld.SAMBA_SUBSYSTEM('HDB_SAMBA4', source='hdb-samba4.c', - deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb db_glue libsamba-hostconfig com_err', + deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb db_glue samba-hostconfig com_err', includes='../heimdal/kdc', local_include=False ) @@ -21,7 +21,7 @@ bld.SAMBA_SUBSYSTEM('WDC_SAMBA4', source='wdc-samba4.c', local_include_first=False, includes='../heimdal/kdc', - deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb PAC_GLUE libsamba-hostconfig com_err' + deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb PAC_GLUE samba-hostconfig com_err' ) @@ -29,14 +29,14 @@ bld.SAMBA_SUBSYSTEM('PAC_GLUE', source='pac-glue.c', local_include_first=False, includes='../heimdal/kdc', - deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb libsamba-hostconfig com_err' + deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb samba-hostconfig com_err' ) bld.SAMBA_LIBRARY('db_glue', source='db-glue.c', local_include=False, - deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb libsamba-hostconfig com_err', + deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb samba-hostconfig com_err', private_library=True ) @@ -44,7 +44,7 @@ bld.SAMBA_LIBRARY('db_glue', bld.SAMBA_SUBSYSTEM('MIT_SAMBA', source='mit_samba.c', local_include=False, - deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb db_glue PAC_GLUE libsamba-hostconfig com_err' + deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb db_glue PAC_GLUE samba-hostconfig com_err' ) diff --git a/source4/ldap_server/wscript_build b/source4/ldap_server/wscript_build index 3ff215a7b87..2c3798afc4f 100644 --- a/source4/ldap_server/wscript_build +++ b/source4/ldap_server/wscript_build @@ -6,6 +6,6 @@ bld.SAMBA_MODULE('LDAP', autoproto='proto.h', subsystem='service', init_function='server_service_ldap_init', - deps='CREDENTIALS cli_ldap SAMDB process_model gensec libsamba-hostconfig samba_server_gensec' + deps='CREDENTIALS cli_ldap SAMDB process_model gensec samba-hostconfig samba_server_gensec' ) diff --git a/source4/lib/cmdline/wscript_build b/source4/lib/cmdline/wscript_build index fbcf9682fb8..d3b457994b7 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 24fbad00ea4..3b8b0a1468e 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 fa7030b51db..d08d5dda0eb 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 5a2dc703305..adfd949fcb5 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 465a90b2644..806dcee95ff 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 b1e588c7232..f596cce349d 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 882974a2571..2e47a15eaa8 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 a9afb1013a0..e2ff9b078a7 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 d99b625194c..b31b692298b 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 d0042a5de87..59e0ce584a7 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' ) diff --git a/source4/libcli/ldap/wscript_build b/source4/libcli/ldap/wscript_build index 7f46c76651d..e8b9b9b260f 100644 --- a/source4/libcli/ldap/wscript_build +++ b/source4/libcli/ldap/wscript_build @@ -5,7 +5,7 @@ bld.SAMBA_LIBRARY('cli_ldap', autoproto='ldap_proto.h', public_deps='errors tevent LIBPACKET', public_headers='libcli_ldap.h:ldap-util.h', - deps='LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS LIBCLI_LDAP_NDR LIBNDR LP_RESOLVE gensec LIBCLI_LDAP_MESSAGE', + deps='LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS LIBCLI_LDAP_NDR ndr LP_RESOLVE gensec LIBCLI_LDAP_MESSAGE', private_library=True ) diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build index 8c51ffc2572..be4aef147bb 100644 --- a/source4/libcli/wscript_build +++ b/source4/libcli/wscript_build @@ -44,7 +44,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMPOSITE', bld.SAMBA_SUBSYSTEM('LIBCLI_DGRAM', source='dgram/dgramsocket.c dgram/mailslot.c dgram/netlogon.c dgram/browse.c', - public_deps='cli_nbt LIBNDR LIBCLI_RESOLVE LIBCLI_NETLOGON LIBCLI_RESOLVE' + public_deps='cli_nbt ndr LIBCLI_RESOLVE LIBCLI_NETLOGON LIBCLI_RESOLVE' ) @@ -65,7 +65,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_RESOLVE', bld.SAMBA_SUBSYSTEM('LP_RESOLVE', source='resolve/bcast.c resolve/nbtlist.c resolve/wins.c resolve/dns_ex.c resolve/file.c resolve/host.c resolve/resolve_lp.c', autoproto='resolve/lp_proto.h', - deps='cli_nbt libsamba-hostconfig netif' + deps='cli_nbt samba-hostconfig netif' ) @@ -87,7 +87,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_RAW', source='raw/rawfile.c raw/smb_signing.c raw/clisocket.c raw/clitransport.c raw/clisession.c raw/clitree.c raw/clierror.c raw/rawrequest.c raw/rawreadwrite.c raw/rawsearch.c raw/rawsetfileinfo.c raw/raweas.c raw/rawtrans.c raw/clioplock.c raw/rawnegotiate.c raw/rawfsinfo.c raw/rawfileinfo.c raw/rawnotify.c raw/rawioctl.c raw/rawacl.c raw/rawdate.c raw/rawlpq.c raw/rawshadow.c', autoproto='raw/raw_proto.h', public_deps='samba_socket LIBPACKET gensec LIBCRYPTO CREDENTIALS LIBCLI_SMB_COMMON', - deps='LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE security LIBNDR' + deps='LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE security ndr' ) bld.RECURSE('smb2') diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build index 48d64abfaf8..4d0899c6170 100644 --- a/source4/libnet/wscript_build +++ b/source4/libnet/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_LIBRARY('samba-net', source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_samdump.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libnet_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_domain.c libnet_samsync.c libnet_export_keytab.c', autoproto='libnet_proto.h', - public_deps='CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH LIBNDR smbpasswd PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET com_err', + public_deps='CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswd PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET com_err', private_library=True ) diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index d100dd3f9de..261633ba89f 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -3,10 +3,10 @@ bld.RECURSE('../../librpc/idl') bld.RECURSE('idl') -bld.SAMBA_LIBRARY('LIBNDR', +bld.SAMBA_LIBRARY('ndr', source='../../librpc/ndr/ndr_string.c ../../librpc/ndr/ndr_basic.c ../../librpc/ndr/uuid.c ../../librpc/ndr/ndr.c ../../librpc/ndr/ndr_misc.c ../../librpc/gen_ndr/ndr_misc.c', pc_files='../../librpc/ndr.pc', - public_deps='errors talloc libsamba-util CHARSET', + public_deps='errors talloc samba-util CHARSET', public_headers='../../librpc/gen_ndr/misc.h ../../librpc/gen_ndr/ndr_misc.h ../../librpc/ndr/libndr.h:ndr.h', header_path= [ ( '*gen_ndr*', 'gen_ndr' ) ], depends_on='PIDL_MISC', @@ -17,14 +17,14 @@ bld.SAMBA_LIBRARY('LIBNDR', bld.SAMBA_BINARY('ndrdump', source='../../librpc/tools/ndrdump.c', manpages='../../librpc/tools/ndrdump.1', - deps='libsamba-hostconfig libsamba-util popt POPT_SAMBA ndr_table errors' + deps='samba-hostconfig samba-util popt POPT_SAMBA ndr_table errors' ) bld.SAMBA_SUBSYSTEM('NDR_SECURITY', source='../../librpc/gen_ndr/ndr_security.c ../../librpc/ndr/ndr_sec_helper.c gen_ndr/ndr_server_id.c', - public_deps='LIBNDR', + public_deps='ndr', public_headers='../../librpc/gen_ndr/security.h gen_ndr/server_id.h', header_path='gen_ndr' ) @@ -32,63 +32,63 @@ bld.SAMBA_SUBSYSTEM('NDR_SECURITY', bld.SAMBA_SUBSYSTEM('NDR_WINSTATION', source='gen_ndr/ndr_winstation.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_IRPC', source='gen_ndr/ndr_irpc.c', - public_deps='LIBNDR NDR_SECURITY NDR_NBT' + public_deps='ndr NDR_SECURITY NDR_NBT' ) bld.SAMBA_SUBSYSTEM('NDR_SASL_HELPERS', source='gen_ndr/ndr_sasl_helpers.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_NFS4ACL', source='gen_ndr/ndr_nfs4acl.c', - public_deps='LIBNDR NDR_SECURITY' + public_deps='ndr NDR_SECURITY' ) bld.SAMBA_SUBSYSTEM('NDR_WINSIF', source='gen_ndr/ndr_winsif.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_OPENDB', source='gen_ndr/ndr_opendb.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_NOTIFY', source='gen_ndr/ndr_s4_notify.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_NTP_SIGND', source='gen_ndr/ndr_ntp_signd.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_WINSREPL', source='gen_ndr/ndr_winsrepl.c', - public_deps='LIBNDR NDR_NBT' + public_deps='ndr NDR_NBT' ) bld.SAMBA_SUBSYSTEM('NDR_WINBIND', source='gen_ndr/ndr_winbind.c', - public_deps='NDR_IDMAP LIBNDR NDR_STANDARD' + public_deps='NDR_IDMAP ndr NDR_STANDARD' ) @@ -99,7 +99,7 @@ bld.SAMBA_LIBRARY('NDR_STANDARD', deps='''NDR_SECURITY NDR_LSA NDR_SAMR NDR_NETLOGON NDR_EVENTLOG NDR_DFS NDR_NTSVCS NDR_SVCCTL NDR_INITSHUTDOWN NDR_WKSSVC NDR_SRVSVC NDR_WINREG NDR_ECHO security NDR_DNS''', - public_deps='LIBNDR', + public_deps='ndr', public_headers='../../librpc/gen_ndr/samr.h ../../librpc/gen_ndr/ndr_samr.h ../../librpc/gen_ndr/lsa.h ../../librpc/gen_ndr/netlogon.h ../../librpc/gen_ndr/atsvc.h ../../librpc/gen_ndr/ndr_atsvc.h ../../librpc/gen_ndr/ndr_svcctl.h ../../librpc/gen_ndr/svcctl.h', header_path='gen_ndr' ) @@ -173,7 +173,7 @@ bld.SAMBA_LIBRARY('dcerpc_atsvc', vnum='0.0.1', public_deps='dcerpc NDR_STANDARD', public_headers='../../librpc/gen_ndr/ndr_atsvc_c.h', - header_path='gen_ndr' + header_path='gen_ndr' ) @@ -185,9 +185,9 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_WINSIF', bld.SAMBA_SUBSYSTEM('NDR_DCERPC', source='../../librpc/gen_ndr/ndr_dcerpc.c', - public_deps='LIBNDR', + public_deps='ndr', public_headers='rpc/dcerpc.h ../../librpc/gen_ndr/ndr_dcerpc.h ../../librpc/gen_ndr/dcerpc.h', - header_path= [ ('*gen_ndr*', 'gen_ndr') ], + header_path= [ ('*gen_ndr*', 'gen_ndr') ], ) bld.SAMBA_LIBRARY('dcerpc', @@ -197,24 +197,24 @@ bld.SAMBA_LIBRARY('dcerpc', ../../librpc/rpc/dcerpc_error.c ../../librpc/rpc/dcerpc_util.c ../../librpc/rpc/binding_handle.c''', pc_files='dcerpc.pc', - deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH LIBCLI_RAW LP_RESOLVE UTIL_TEVENT', + deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH LIBCLI_RAW LP_RESOLVE UTIL_TEVENT', autoproto='rpc/dcerpc_proto.h', public_deps='CREDENTIALS tevent talloc', public_headers='../../librpc/gen_ndr/mgmt.h ../../librpc/gen_ndr/ndr_mgmt.h ../../librpc/gen_ndr/ndr_mgmt_c.h ../../librpc/gen_ndr/epmapper.h ../../librpc/gen_ndr/ndr_epmapper.h ../../librpc/gen_ndr/ndr_epmapper_c.h', - header_path='gen_ndr', + header_path='gen_ndr', vnum='0.0.1' ) bld.SAMBA_SUBSYSTEM('pyrpc_util', - source='rpc/pyrpc_util.c', - public_deps='PYTALLOC pyparam_util dcerpc', - pyext=True, - ) + source='rpc/pyrpc_util.c', + public_deps='PYTALLOC pyparam_util dcerpc', + pyext=True, + ) bld.SAMBA_PYTHON('python_dcerpc', source='rpc/pyrpc.c', - public_deps='LIBCLI_SMB libsamba-util libsamba-hostconfig dcerpc_samr RPC_NDR_LSA DYNCONFIG pyrpc_util', + public_deps='LIBCLI_SMB samba-util samba-hostconfig dcerpc_samr RPC_NDR_LSA DYNCONFIG pyrpc_util', realname='samba/dcerpc/base.so' ) diff --git a/source4/nbt_server/wscript_build b/source4/nbt_server/wscript_build index 594bc5aab46..13058adcc06 100644 --- a/source4/nbt_server/wscript_build +++ b/source4/nbt_server/wscript_build @@ -11,7 +11,7 @@ bld.SAMBA_MODULE('ldb_wins_ldb', source='wins/wins_ldb.c', subsystem='ldb', init_function='LDB_MODULE(wins_ldb)', - deps='ldb netif libsamba-hostconfig libsamba-util', + deps='ldb netif samba-hostconfig samba-util', internal_module=False, ) diff --git a/source4/ntvfs/posix/wscript_build b/source4/ntvfs/posix/wscript_build index 847c37f0c57..497a0e51ad9 100644 --- a/source4/ntvfs/posix/wscript_build +++ b/source4/ntvfs/posix/wscript_build @@ -41,14 +41,14 @@ bld.SAMBA_MODULE('ntvfs_posix', bld.SAMBA_PYTHON('python_xattr_native', source='python/pyxattr_native.c', - deps='LIBNDR ldb SAMDB CREDENTIALS pyparam_util wrap_xattr attr', + deps='ndr ldb SAMDB CREDENTIALS pyparam_util wrap_xattr attr', realname='samba/xattr_native.so' ) bld.SAMBA_PYTHON('python_xattr_tdb', source='python/pyxattr_tdb.c xattr_tdb.c', - deps='LIBNDR ldb pyparam_util share attr', + deps='ndr ldb pyparam_util share attr', realname='samba/xattr_tdb.so' ) diff --git a/source4/param/wscript_build b/source4/param/wscript_build index 35b723584ee..c8e3d59407e 100644 --- a/source4/param/wscript_build +++ b/source4/param/wscript_build @@ -1,11 +1,11 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('libsamba-hostconfig', +bld.SAMBA_LIBRARY('samba-hostconfig', source='loadparm.c generic.c util.c', pc_files='samba-hostconfig.pc', vnum='0.0.1', deps='DYNCONFIG CHARSET', - public_deps='libsamba-util', + public_deps='samba-util', public_headers='param.h', autoproto='param_proto.h', ) @@ -21,7 +21,7 @@ bld.SAMBA_SUBSYSTEM('PROVISION', bld.SAMBA_SUBSYSTEM('share', source='share.c', public_headers='share.h', - deps='libsamba-util' + deps='samba-util' ) @@ -29,7 +29,7 @@ bld.SAMBA_MODULE('share_classic', source='share_classic.c', subsystem='share', init_function='share_classic_init', - deps='libsamba-util' + deps='samba-util' ) @@ -49,14 +49,14 @@ bld.SAMBA_SUBSYSTEM('SECRETS', bld.SAMBA_PYTHON('param', source='pyparam.c', - deps='libsamba-hostconfig PYTALLOC', + deps='samba-hostconfig PYTALLOC', realname='samba/param.so' ) bld.SAMBA_SUBSYSTEM('pyparam_util', source='pyparam_util.c', - deps='LIBPYTHON libsamba-hostconfig', + deps='LIBPYTHON samba-hostconfig', pyext=True, ) diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build index a7303d118de..86265f2e553 100644 --- a/source4/rpc_server/wscript_build +++ b/source4/rpc_server/wscript_build @@ -86,7 +86,7 @@ bld.SAMBA_MODULE('dcerpc_netlogon', source='netlogon/dcerpc_netlogon.c', subsystem='dcerpc_server', init_function='dcerpc_server_netlogon_init', - deps='DCERPC_COMMON RPC_NDR_IRPC COMMON_SCHANNELDB NDR_STANDARD auth_sam libsamba-hostconfig CLDAPD' + deps='DCERPC_COMMON RPC_NDR_IRPC COMMON_SCHANNELDB NDR_STANDARD auth_sam samba-hostconfig CLDAPD' ) @@ -133,7 +133,7 @@ bld.SAMBA_MODULE('dcerpc_eventlog', bld.SAMBA_LIBRARY('dcerpc_server', source='dcerpc_server.c dcesrv_auth.c dcesrv_mgmt.c handles.c', pc_files='dcerpc_server.pc', - deps='LIBCLI_AUTH LIBNDR samba_server_gensec dcerpc_remote service', + deps='LIBCLI_AUTH ndr samba_server_gensec dcerpc_remote service', public_deps='dcerpc', autoproto='dcerpc_server_proto.h', public_headers='dcerpc_server.h', diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build index 3587c5a5028..7f56afd5928 100644 --- a/source4/scripting/python/wscript_build +++ b/source4/scripting/python/wscript_build @@ -25,7 +25,7 @@ bld.SAMBA_SUBSYSTEM('PYTALLOC', bld.SAMBA_PYTHON('python_uuid', source='uuidmodule.c', - deps='LIBNDR', + deps='ndr', realname='uuid.so', enabled = float(bld.env.PYTHON_VERSION) <= 2.4 ) @@ -33,7 +33,7 @@ bld.SAMBA_PYTHON('python_uuid', bld.SAMBA_PYTHON('python_glue', source='pyglue.c', - deps='pyparam_util libsamba-util netif PYTALLOC', + deps='pyparam_util samba-util netif PYTALLOC', realname='samba/_glue.so' ) diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build index b21879ddb51..8da2ea12c51 100644 --- a/source4/smbd/wscript_build +++ b/source4/smbd/wscript_build @@ -18,7 +18,7 @@ bld.SAMBA_BINARY('samba', source='server.c', manpages='samba.8', subsystem_name='service', - deps='''events process_model service libsamba-hostconfig libsamba-util POPT_SAMBA PIDFILE + deps='''events process_model service samba-hostconfig samba-util POPT_SAMBA PIDFILE popt gensec registry ntptr ntvfs share CLUSTER DCESRV COMMON_SCHANNELDB SECRETS''', pyembed=True, install_path='${SBINDIR}' @@ -70,6 +70,6 @@ bld.SAMBA_MODULE('process_model_onefork', bld.SAMBA_SUBSYSTEM('process_model', source='process_model.c', autoproto='process_model_proto.h', - deps='libsamba-util libsamba-hostconfig' + deps='samba-util samba-hostconfig' ) diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build index be420a169d4..363df08e838 100644 --- a/source4/torture/wscript_build +++ b/source4/torture/wscript_build @@ -157,14 +157,14 @@ bld.SAMBA_BINARY('smbtorture', bld.SAMBA_BINARY('gentest', source='gentest.c', manpages='man/gentest.1', - deps='libsamba-hostconfig libsamba-util popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB LIBCLI_RAW' + deps='samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB LIBCLI_RAW' ) bld.SAMBA_BINARY('masktest', source='masktest.c', manpages='man/masktest.1', - deps='libsamba-hostconfig libsamba-util popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB' + deps='samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB' ) @@ -175,6 +175,6 @@ bld.SAMBA_BINARY('locktest', #cflags='--coverage', # GCOV='1', manpages='man/locktest.1', - deps='popt POPT_SAMBA POPT_CREDENTIALS libsamba-util LIBCLI_SMB libsamba-hostconfig', + deps='popt POPT_SAMBA POPT_CREDENTIALS samba-util LIBCLI_SMB samba-hostconfig', ) diff --git a/source4/utils/net/wscript_build b/source4/utils/net/wscript_build index 62f1621d649..48c766336dd 100644 --- a/source4/utils/net/wscript_build +++ b/source4/utils/net/wscript_build @@ -12,7 +12,7 @@ bld.SAMBA_MODULE('net_drs', bld.SAMBA_BINARY('net', source='net.c net_password.c net_vampire.c net_gpo.c', autoproto='net_proto.h', - deps='libsamba-hostconfig libsamba-util samba-net popt POPT_SAMBA POPT_CREDENTIALS net_drs policy auth', + deps='samba-hostconfig samba-util samba-net popt POPT_SAMBA POPT_CREDENTIALS net_drs policy auth', pyembed=True ) diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build index 1565855660e..f7a6a5f48e1 100644 --- a/source4/utils/wscript_build +++ b/source4/utils/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_BINARY('ntlm_auth', source='ntlm_auth.c', manpages='man/ntlm_auth.1', - deps='libsamba-hostconfig libsamba-util popt POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth ntlm_check MESSAGING events service', + deps='samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth ntlm_check MESSAGING events service', pyembed=True ) -- 2.34.1