diff options
-rw-r--r-- | source4/cldap_server/wscript_build | 2 | ||||
-rw-r--r-- | source4/dns_server/wscript_build | 2 | ||||
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/wscript_build | 4 | ||||
-rw-r--r-- | source4/dsdb/wscript_build | 4 | ||||
-rw-r--r-- | source4/lib/ldb-samba/wscript_build | 8 | ||||
-rw-r--r-- | source4/lib/registry/wscript_build | 2 | ||||
-rw-r--r-- | source4/nbt_server/wscript_build | 2 | ||||
-rw-r--r-- | source4/ntptr/wscript_build | 2 | ||||
-rw-r--r-- | source4/param/wscript_build | 2 | ||||
-rw-r--r-- | source4/samba_tool/wscript_build | 2 | ||||
-rw-r--r-- | source4/smbd/wscript_build | 6 | ||||
-rw-r--r-- | source4/torture/drs/wscript_build | 2 | ||||
-rw-r--r-- | source4/torture/wscript_build | 2 | ||||
-rw-r--r-- | source4/winbind/wscript_build | 2 |
14 files changed, 21 insertions, 21 deletions
diff --git a/source4/cldap_server/wscript_build b/source4/cldap_server/wscript_build index ce586dcc61..7b329123cd 100644 --- a/source4/cldap_server/wscript_build +++ b/source4/cldap_server/wscript_build @@ -11,6 +11,6 @@ bld.SAMBA_MODULE('service_cldap', bld.SAMBA_SUBSYSTEM('CLDAPD', source='netlogon.c rootdse.c', autoproto='proto.h', - deps='LIBCLI_CLDAP LDBSAMBA' + deps='LIBCLI_CLDAP ldbsamba' ) diff --git a/source4/dns_server/wscript_build b/source4/dns_server/wscript_build index 45dae0c87a..3a0f289a92 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='samba-hostconfig LIBTSOCKET LIBSAMBA_TSOCKET LDBSAMBA', + deps='samba-hostconfig LIBTSOCKET LIBSAMBA_TSOCKET ldbsamba', local_include=False ) diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build index 5963f8551f..0d092c2f49 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -130,7 +130,7 @@ bld.SAMBA_MODULE('ldb_samba3sid', init_function='ldb_samba3sid_module_init', module_init_name='ldb_init_module', internal_module=False, - deps='talloc events ldb security NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS' + deps='talloc events ldb security NDR_SECURITY ldbsamba DSDB_MODULE_HELPERS' ) @@ -140,7 +140,7 @@ bld.SAMBA_MODULE('ldb_simple_ldap_map', init_function='ldb_simple_ldap_map_module_init', module_init_name='ldb_init_module', internal_module=False, - deps='talloc events ldb ndr LDBSAMBA' + deps='talloc events ldb ndr ldbsamba' ) diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index 84c10de7bd..2622e75a72 100644 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -7,7 +7,7 @@ bld.SAMBA_LIBRARY('samdb', autoproto='samdb/samdb_proto.h', private_library=True, public_deps='krb5', - 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 authkrb5 CREDENTIALS ldbwrap', + 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 authkrb5 CREDENTIALS ldbwrap', ) @@ -22,7 +22,7 @@ bld.SAMBA_LIBRARY('samdb-common', bld.SAMBA_SUBSYSTEM('SAMDB_SCHEMA', source='schema/schema_init.c schema/schema_set.c schema/schema_query.c schema/schema_syntax.c schema/schema_description.c schema/schema_convert_to_ol.c schema/schema_inferiors.c schema/schema_prefixmap.c schema/schema_info_attr.c schema/schema_filtered.c schema/dsdb_dn.c', autoproto='schema/proto.h', - deps='samdb-common NDR_DRSUAPI NDR_DRSBLOBS LDBSAMBA tevent' + deps='samdb-common NDR_DRSUAPI NDR_DRSBLOBS ldbsamba tevent' ) diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build index 0ddec30532..115d2bf501 100644 --- a/source4/lib/ldb-samba/wscript_build +++ b/source4/lib/ldb-samba/wscript_build @@ -4,7 +4,7 @@ # as a built-in module and this delutes the symbols in the ldb library with # the symbols of all of ldb_ildap's dependencies. -bld.SAMBA_LIBRARY('LDBSAMBA', +bld.SAMBA_LIBRARY('ldbsamba', source='ldif_handlers.c', autoproto='ldif_handlers_proto.h', public_deps='ldb', @@ -16,12 +16,12 @@ bld.SAMBA_LIBRARY('LDBSAMBA', bld.SAMBA_SUBSYSTEM('ldbwrap', source='ldb_wrap.c', public_headers='ldb_wrap.h', - deps='ldb samba-util LDBSAMBA samba-hostconfig' + deps='ldb samba-util ldbsamba samba-hostconfig' ) bld.SAMBA_PYTHON('python_samba__ldb', 'pyldb.c', - deps='LDBSAMBA pyparam_util ldbwrap', + deps='ldbsamba pyparam_util ldbwrap', realname='samba/_ldb.so') bld.SAMBA_MODULE('ldbsamba_extensions', @@ -29,7 +29,7 @@ bld.SAMBA_MODULE('ldbsamba_extensions', init_function='ldb_samba_extensions_init', module_init_name='ldb_init_module', subsystem='ldb', - deps='ldb LDBSAMBA POPT_SAMBA POPT_CREDENTIALS cmdline-credentials gensec', + deps='ldb ldbsamba POPT_SAMBA POPT_CREDENTIALS cmdline-credentials gensec', internal_module=False) diff --git a/source4/lib/registry/wscript_build b/source4/lib/registry/wscript_build index a61c36d73b..f7f167f8f9 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='samba-util TDR_REGF ldb RPC_NDR_WINREG LDBSAMBA', + public_deps='samba-util TDR_REGF ldb RPC_NDR_WINREG ldbsamba', public_headers='registry.h', vnum='0.0.1' ) diff --git a/source4/nbt_server/wscript_build b/source4/nbt_server/wscript_build index eee008d0b8..6fe64a4d93 100644 --- a/source4/nbt_server/wscript_build +++ b/source4/nbt_server/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_SUBSYSTEM('WINSDB', source='wins/winsdb.c wins/wins_hook.c', autoproto='wins/winsdb_proto.h', - public_deps='ldb LDBSAMBA' + public_deps='ldb ldbsamba' ) diff --git a/source4/ntptr/wscript_build b/source4/ntptr/wscript_build index d34d062ce1..ce858ae2d5 100644 --- a/source4/ntptr/wscript_build +++ b/source4/ntptr/wscript_build @@ -4,7 +4,7 @@ bld.SAMBA_MODULE('ntptr_simple_ldb', source='simple_ldb/ntptr_simple_ldb.c', subsystem='ntptr', init_function='ntptr_simple_ldb_init', - deps='ldb NDR_SPOOLSS DCERPC_COMMON LDBSAMBA' + deps='ldb NDR_SPOOLSS DCERPC_COMMON ldbsamba' ) diff --git a/source4/param/wscript_build b/source4/param/wscript_build index e65bc017d8..5f69565f92 100644 --- a/source4/param/wscript_build +++ b/source4/param/wscript_build @@ -37,7 +37,7 @@ bld.SAMBA_MODULE('share_ldb', source='share_ldb.c', subsystem='share', init_function='share_ldb_init', - deps='LDBSAMBA auth_system_session' + deps='ldbsamba auth_system_session' ) diff --git a/source4/samba_tool/wscript_build b/source4/samba_tool/wscript_build index df4d2de58f..1f5390d5c1 100644 --- a/source4/samba_tool/wscript_build +++ b/source4/samba_tool/wscript_build @@ -4,7 +4,7 @@ bld.SAMBA_MODULE('samba_tool_drs', source='drs/drs.c drs/drs_bind.c drs/drs_kcc.c drs/drs_replicate.c drs/drs_showrepl.c', autoproto='drs/drs_proto.h', subsystem='samba-tool', - deps='LIBCLI_DRSUAPI ldb LDBSAMBA', + deps='LIBCLI_DRSUAPI ldb ldbsamba', internal_module=True ) diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build index ac9f38d5f6..40dab4a48b 100644 --- a/source4/smbd/wscript_build +++ b/source4/smbd/wscript_build @@ -41,7 +41,7 @@ bld.SAMBA_MODULE('process_model_standard', source='process_standard.c', subsystem='process_model', init_function='process_model_standard_init', - deps='events LDBSAMBA process_model samba-sockets cluster', + deps='events ldbsamba process_model samba-sockets cluster', internal_module=False ) @@ -60,7 +60,7 @@ bld.SAMBA_MODULE('process_model_prefork', source='process_prefork.c', subsystem='process_model', init_function='process_model_prefork_init', - deps='events LDBSAMBA cluster samba-sockets process_model', + deps='events ldbsamba cluster samba-sockets process_model', internal_module=False ) @@ -68,7 +68,7 @@ bld.SAMBA_MODULE('process_model_onefork', source='process_onefork.c', subsystem='process_model', init_function='process_model_onefork_init', - deps='events LDBSAMBA process_model cluster samba-sockets', + deps='events ldbsamba process_model cluster samba-sockets', internal_module=False ) diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build index 9109fcfff1..9d4d321633 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='samba-util ldb POPT_SAMBA errors torture LDBSAMBA talloc dcerpc ndr NDR_DRSUAPI gensec samba-hostconfig RPC_NDR_DRSUAPI DSDB_MODULE_HELPERS ASN1_UTIL samdb NDR_DRSBLOBS CREDENTIALS samdb-common LIBCLI_RESOLVE LP_RESOLVE torturemain', + deps='samba-util ldb POPT_SAMBA errors torture ldbsamba talloc dcerpc ndr NDR_DRSUAPI gensec samba-hostconfig RPC_NDR_DRSUAPI DSDB_MODULE_HELPERS ASN1_UTIL samdb NDR_DRSBLOBS CREDENTIALS samdb-common LIBCLI_RESOLVE LP_RESOLVE torturemain', internal_module=True ) diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build index c154da33aa..9b802ef9df 100644 --- a/source4/torture/wscript_build +++ b/source4/torture/wscript_build @@ -102,7 +102,7 @@ bld.SAMBA_MODULE('TORTURE_UNIX', bld.SAMBA_MODULE('TORTURE_LDAP', source='ldap/common.c ldap/basic.c ldap/schema.c ldap/uptodatevector.c ldap/cldap.c ldap/cldapbench.c ldap/ldap_sort.c ldap/nested_search.c', subsystem='smbtorture', - deps='cli-ldap LIBCLI_CLDAP samdb POPT_CREDENTIALS torture LDBSAMBA', + deps='cli-ldap LIBCLI_CLDAP samdb POPT_CREDENTIALS torture ldbsamba', internal_module=True, autoproto='ldap/proto.h', init_function='torture_ldap_init' diff --git a/source4/winbind/wscript_build b/source4/winbind/wscript_build index 46f5294ea4..8ef1fd3b46 100644 --- a/source4/winbind/wscript_build +++ b/source4/winbind/wscript_build @@ -20,6 +20,6 @@ bld.SAMBA_SUBSYSTEM('WB_HELPER', bld.SAMBA_SUBSYSTEM('IDMAP', source='idmap.c', autoproto='idmap_proto.h', - public_deps='samdb-common LDBSAMBA' + public_deps='samdb-common ldbsamba' ) |