summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/tdr/wscript_build2
-rw-r--r--lib/torture/wscript_build2
-rw-r--r--lib/util/wscript_build2
-rw-r--r--libcli/auth/wscript_build2
-rw-r--r--libcli/cldap/wscript_build2
-rw-r--r--libcli/ldap/wscript_build8
-rw-r--r--libcli/nbt/wscript_build8
-rw-r--r--libgpo/wscript_build2
-rw-r--r--librpc/wscript_build2
-rw-r--r--nsswitch/wscript_build4
-rw-r--r--source3/wscript_build26
-rw-r--r--source4/auth/credentials/wscript_build2
-rw-r--r--source4/auth/gensec/wscript_build2
-rw-r--r--source4/auth/ntlm/wscript_build6
-rw-r--r--source4/client/wscript_build4
-rw-r--r--source4/dns_server/wscript_build2
-rw-r--r--source4/dsdb/samdb/ldb_modules/wscript_build24
-rw-r--r--source4/dsdb/wscript_build12
-rw-r--r--source4/heimdal_build/wscript_build2
-rw-r--r--source4/kdc/wscript_build12
-rw-r--r--source4/ldap_server/wscript_build2
-rw-r--r--source4/lib/cmdline/wscript_build4
-rw-r--r--source4/lib/com/wscript_build2
-rw-r--r--source4/lib/events/wscript_build2
-rw-r--r--source4/lib/messaging/wscript_build2
-rw-r--r--source4/lib/policy/wscript_build2
-rw-r--r--source4/lib/registry/wscript_build10
-rw-r--r--source4/lib/samba3/wscript_build2
-rw-r--r--source4/lib/socket/wscript_build4
-rw-r--r--source4/lib/tls/wscript2
-rw-r--r--source4/lib/wmi/wscript_build2
-rw-r--r--source4/libcli/ldap/wscript_build2
-rw-r--r--source4/libcli/wbclient/wscript_build2
-rw-r--r--source4/libcli/wscript_build6
-rw-r--r--source4/libnet/wscript_build4
-rwxr-xr-xsource4/librpc/wscript_build6
-rw-r--r--source4/nbt_server/wscript_build2
-rw-r--r--source4/param/wscript_build12
-rw-r--r--source4/rpc_server/wscript_build2
-rw-r--r--source4/scripting/python/wscript_build2
-rw-r--r--source4/smbd/wscript_build4
-rw-r--r--source4/torture/drs/wscript_build2
-rw-r--r--source4/torture/wscript_build10
-rw-r--r--source4/utils/net/wscript_build2
-rw-r--r--source4/utils/wscript_build2
-rw-r--r--source4/winbind/wscript_build2
46 files changed, 110 insertions, 110 deletions
diff --git a/lib/tdr/wscript_build b/lib/tdr/wscript_build
index a28c601ab1..627bfecada 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 a3ba60592d..b758248763 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 aacd415e72..de84d4e5a1 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 2bfb92a459..24b04c4a65 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 5def749d8f..77767a3f42 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='LIBCLI_LDAP',
- deps='LIBTSOCKET LIBSAMBA-UTIL UTIL_TEVENT ldb LIBCLI_NETLOGON'
+ deps='LIBTSOCKET libsamba-util UTIL_TEVENT ldb LIBCLI_NETLOGON'
)
diff --git a/libcli/ldap/wscript_build b/libcli/ldap/wscript_build
index d3b8446e27..d9030c040e 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 a39f835645..8602282ed7 100644
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -9,7 +9,7 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
bld.SAMBA_LIBRARY('LIBCLI_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 LIBCLI_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='LIBCLI_NBT DYNCONFIG libsamba-hostconfig',
realname='samba/netbios.so'
)
diff --git a/libgpo/wscript_build b/libgpo/wscript_build
index 06b037f4cf..e2fe711110 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 995382db14..fa838dad2a 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'
)
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index e367cc726c..8ae72bff54 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -10,13 +10,13 @@ bld.SAMBA_LIBRARY('libwinbind-client',
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 libwinbind-client LIBWBCLIENT tevent UTIL_TEVENT LIBASYNC_REQ libsecurity LIBNDR NDR_SECURITY'
)
bld.SAMBA_LIBRARY('nss_winbind',
diff --git a/source3/wscript_build b/source3/wscript_build
index 5f8df0cf05..3abcd178e6 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -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 2e962267c2..14ba67b720 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 a1c3257979..679c8130eb 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 12bf184a8e..eb5d9b0ae2 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'
)
@@ -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 libsecurity SAMDB CREDENTIALS UTIL_TEVENT',
+ deps='libsamba-util libsecurity SAMDB CREDENTIALS UTIL_TEVENT',
private_library=True
)
diff --git a/source4/client/wscript_build b/source4/client/wscript_build
index d35b6a8fca..a1629de11b 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 5191480d6b..3a3d6dfc4f 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 f303e0f212..3acb16365a 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -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 libevents LIBSAMBA-UTIL'
+ deps='talloc libevents libsamba-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 libevents LIBNDR LIBSAMBA-UTIL SAMDB',
+ deps='talloc libevents LIBNDR libsamba-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 libevents LIBSAMBA-UTIL SAMDB DSDB_MODULE_HELPERS'
+ deps='talloc libevents libsamba-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 libevents LIBSAMBA-UTIL DSDB_MODULE_HELPERS'
+ deps='talloc libevents libsamba-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 libevents libsecurity NDR_SECURITY SAMDB DSDB_MODULE_HELPERS LIBSAMBA-UTIL DSDB_MODULE_HELPER_SCHEMA'
+ deps='talloc libevents libsecurity NDR_SECURITY SAMDB DSDB_MODULE_HELPERS libsamba-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 libsamba-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 libevents LIBSAMBA-UTIL ldb samdb_common'
+ deps='talloc libevents libsamba-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 libevents LIBSAMBA-UTIL DSDB_MODULE_HELPERS'
+ deps='talloc libevents libsamba-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 libevents LIBSAMBA-UTIL ldb'
+ deps='talloc libevents libsamba-util ldb'
)
@@ -292,7 +292,7 @@ bld.SAMBA_MODULE('ldb_anr',
subsystem='ldb',
init_function='LDB_MODULE(anr)',
internal_module=False,
- deps='talloc libevents LIBSAMBA-UTIL SAMDB'
+ deps='talloc libevents libsamba-util SAMDB'
)
@@ -301,7 +301,7 @@ bld.SAMBA_MODULE('ldb_instancetype',
subsystem='ldb',
init_function='LDB_MODULE(instancetype)',
internal_module=False,
- deps='talloc libevents LIBSAMBA-UTIL SAMDB DSDB_MODULE_HELPERS'
+ deps='talloc libevents libsamba-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 libsamba-util samdb_common DSDB_MODULE_HELPERS auth auth_session'
)
diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index 964fb9bbb6..091da813e1 100644
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -6,17 +6,17 @@ 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='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',
vnum='0.0.1'
)
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'
- )
+ 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'
+ )
bld.SAMBA_SUBSYSTEM('SAMDB_SCHEMA',
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 7b032c7cc6..e08186a6f5 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -617,7 +617,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 libsamba-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 039f66f45c..ee5a463369 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 libsamba-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 libsamba-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 libsamba-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 libsamba-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 libsamba-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 libsamba-hostconfig com_err'
)
diff --git a/source4/ldap_server/wscript_build b/source4/ldap_server/wscript_build
index e72f5f816f..1729a998db 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 LIBCLI_LDAP SAMDB process_model gensec LIBSAMBA-HOSTCONFIG samba_server_gensec'
+ deps='CREDENTIALS LIBCLI_LDAP SAMDB process_model gensec libsamba-hostconfig samba_server_gensec'
)
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'
)
diff --git a/source4/libcli/ldap/wscript_build b/source4/libcli/ldap/wscript_build
index 651e6cda6c..91b1012d03 100644
--- a/source4/libcli/ldap/wscript_build
+++ b/source4/libcli/ldap/wscript_build
@@ -3,7 +3,7 @@
bld.SAMBA_LIBRARY('LIBCLI_LDAP',
source='ldap_client.c ldap_bind.c ldap_ildap.c ldap_controls.c',
autoproto='ldap_proto.h',
- public_deps='LIBSAMBA-ERRORS tevent LIBPACKET',
+ public_deps='libsamba-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',
private_library=True
diff --git a/source4/libcli/wbclient/wscript_build b/source4/libcli/wbclient/wscript_build
index 3e584939e2..3509d3efdc 100644
--- a/source4/libcli/wbclient/wscript_build
+++ b/source4/libcli/wbclient/wscript_build
@@ -2,7 +2,7 @@
bld.SAMBA_SUBSYSTEM('LIBWBCLIENT_OLD',
source='wbclient.c',
- public_deps='LIBSAMBA-ERRORS libevents',
+ public_deps='libsamba-errors libevents',
deps='NDR_WINBIND MESSAGING RPC_NDR_WINBIND'
)
diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index e11d372d18..de5d4323ff 100644
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -4,7 +4,7 @@ bld.RECURSE('ldap')
bld.RECURSE('security')
bld.RECURSE('wbclient')
-bld.SAMBA_LIBRARY('LIBSAMBA-ERRORS',
+bld.SAMBA_LIBRARY('libsamba-errors',
source='../../libcli/util/doserr.c util/errormap.c util/nterr.c',
public_headers='../../libcli/util/error.h ../../libcli/util/ntstatus.h ../../libcli/util/doserr.h ../../libcli/util/werror.h',
header_path='core',
@@ -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='LIBCLI_NBT LIBSAMBA-HOSTCONFIG libnetif'
+ deps='LIBCLI_NBT libsamba-hostconfig libnetif'
)
@@ -79,7 +79,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_FINDDCS',
bld.SAMBA_SUBSYSTEM('LIBCLI_SMB',
source='clireadwrite.c cliconnect.c clifile.c clilist.c clitrans2.c climessage.c clideltree.c',
autoproto='libcli_proto.h',
- public_deps='LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH LIBCLI_SMB_COMPOSITE LIBCLI_NBT libsecurity LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
+ public_deps='LIBCLI_RAW libsamba-errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE LIBCLI_NBT libsecurity LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
)
diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build
index 59f69a2551..a5ccb57ba9 100644
--- a/source4/libnet/wscript_build
+++ b/source4/libnet/wscript_build
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('LIBSAMBA-NET',
+bld.SAMBA_LIBRARY('libsamba-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',
@@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('LIBSAMBA-NET',
bld.SAMBA_PYTHON('python_net',
source='py_net.c',
- deps='LIBSAMBA-NET pyrpc_util',
+ deps='libsamba-net pyrpc_util',
realname='samba/net.so'
)
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 0acf4cc3ab..e422aa952b 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -6,7 +6,7 @@ bld.RECURSE('idl')
bld.SAMBA_LIBRARY('LIBNDR',
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='LIBSAMBA-ERRORS talloc LIBSAMBA-UTIL CHARSET',
+ public_deps='libsamba-errors talloc libsamba-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,7 +17,7 @@ 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 LIBSAMBA-ERRORS'
+ deps='libsamba-hostconfig libsamba-util popt POPT_SAMBA ndr_table libsamba-errors'
)
@@ -218,7 +218,7 @@ bld.SAMBA_SUBSYSTEM('pyrpc_util',
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 libsamba-util libsamba-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 286dbf3602..9b540aa371 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 libnetif LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL',
+ deps='ldb libnetif libsamba-hostconfig libsamba-util',
internal_module=False,
)
diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index 19f0369930..87b209f235 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('libsamba-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='libsamba-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='libsamba-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='libsamba-util'
)
@@ -49,14 +49,14 @@ bld.SAMBA_SUBSYSTEM('SECRETS',
bld.SAMBA_PYTHON('param',
source='pyparam.c',
- deps='LIBSAMBA-HOSTCONFIG PYTALLOC',
+ deps='libsamba-hostconfig PYTALLOC',
realname='samba/param.so'
)
bld.SAMBA_SUBSYSTEM('pyparam_util',
source='pyparam_util.c',
- deps='LIBPYTHON LIBSAMBA-HOSTCONFIG',
+ deps='LIBPYTHON libsamba-hostconfig',
pyext=True,
)
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 18d4be30ca..a8a2ca5a3f 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 libsamba-hostconfig CLDAPD'
)
diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
index 638aed5fc6..92215315af 100644
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -33,7 +33,7 @@ bld.SAMBA_PYTHON('python_uuid',
bld.SAMBA_PYTHON('python_glue',
source='pyglue.c',
- deps='pyparam_util LIBSAMBA-UTIL libnetif PYTALLOC',
+ deps='pyparam_util libsamba-util libnetif PYTALLOC',
realname='samba/_glue.so'
)
diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 486b0ceea8..46ec768d43 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='''libevents process_model service LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL POPT_SAMBA PIDFILE
+ deps='''libevents process_model service libsamba-hostconfig libsamba-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='libsamba-util libsamba-hostconfig'
)
diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build
index 15b7361d64..aa2ad7328e 100644
--- a/source4/torture/drs/wscript_build
+++ b/source4/torture/drs/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_MODULE('TORTURE_DRS',
autoproto='proto.h',
subsystem='smbtorture',
init_function='torture_drs_init',
- deps='ndr_table RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI DSDB_MODULE_HELPERS',
+ deps='ndr_table RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER libsamba-net LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER LIBCLI_DRSUAPI DSDB_MODULE_HELPERS',
internal_module=True
)
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 48581f77af..30ac7e6e3b 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -44,7 +44,7 @@ bld.SAMBA_MODULE('torture_rpc',
autoproto='rpc/proto.h',
subsystem='smbtorture',
init_function='torture_rpc_init',
- deps='ndr_table RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_DFS',
+ deps='ndr_table RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER libsamba-net LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP dcerpc_server service process_model ntvfs RPC_NDR_BROWSER LIBCLI_DRSUAPI TORTURE_DFS',
internal_module=True
)
@@ -124,7 +124,7 @@ bld.SAMBA_MODULE('TORTURE_NET',
autoproto='libnet/proto.h',
subsystem='smbtorture',
init_function='torture_net_init',
- deps='LIBSAMBA-NET POPT_CREDENTIALS torture_rpc PROVISION',
+ deps='libsamba-net POPT_CREDENTIALS torture_rpc PROVISION',
internal_module=True
)
@@ -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='libsamba-hostconfig libsamba-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='libsamba-hostconfig libsamba-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 libsamba-util LIBCLI_SMB libsamba-hostconfig',
)
diff --git a/source4/utils/net/wscript_build b/source4/utils/net/wscript_build
index ee40cb8582..772795f07e 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 LIBSAMBA-NET popt POPT_SAMBA POPT_CREDENTIALS net_drs policy auth',
+ deps='libsamba-hostconfig libsamba-util libsamba-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 cc1820d68b..e22ec43f85 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 libevents service',
+ deps='libsamba-hostconfig libsamba-util popt POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth ntlm_check MESSAGING libevents service',
pyembed=True
)
diff --git a/source4/winbind/wscript_build b/source4/winbind/wscript_build
index 170ff1e41e..bd1090b277 100644
--- a/source4/winbind/wscript_build
+++ b/source4/winbind/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_MODULE('WINBIND',
autoproto='wb_proto.h',
subsystem='service',
init_function='server_service_winbind_init',
- deps='WB_HELPER IDMAP NDR_WINBIND process_model RPC_NDR_LSA dcerpc_samr PAM_ERRORS LIBCLI_LDAP LIBSAMBA-NET LIBSAMBA_TSOCKET'
+ deps='WB_HELPER IDMAP NDR_WINBIND process_model RPC_NDR_LSA dcerpc_samr PAM_ERRORS LIBCLI_LDAP libsamba-net LIBSAMBA_TSOCKET'
)