diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/wscript_build | 12 | ||||
| -rw-r--r-- | source4/dsdb/wscript_build | 6 | ||||
| -rw-r--r-- | source4/kdc/wscript_build | 18 | ||||
| -rw-r--r-- | source4/ldap_server/wscript_build | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/wscript | 2 | ||||
| -rw-r--r-- | source4/libcli/ldap/wscript_build | 2 | ||||
| -rw-r--r-- | source4/libcli/security/wscript_build | 2 | ||||
| -rw-r--r-- | source4/libcli/wscript_build | 8 | ||||
| -rw-r--r-- | source4/libnet/wscript_build | 2 | ||||
| -rwxr-xr-x | source4/librpc/wscript_build | 18 | ||||
| -rw-r--r-- | source4/nbt_server/wscript_build | 4 | ||||
| -rw-r--r-- | source4/rpc_server/wscript_build | 8 | ||||
| -rw-r--r-- | source4/torture/drs/wscript_build | 2 | ||||
| -rw-r--r-- | source4/torture/wscript_build | 6 | ||||
| -rw-r--r-- | source4/winbind/wscript_build | 6 |
15 files changed, 49 insertions, 49 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build index a5a520c554..a2ed6592f3 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -1,6 +1,6 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('dsdb_module', +bld.SAMBA_LIBRARY('dsdb-module', source=[], deps='DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA DSDB_MODULE_HELPER_RIDALLOC', private_library=True, @@ -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 ndr samdb_common security_session' + deps='ldb ndr samdb-common security-session' ) bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_RIDALLOC', @@ -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 ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS security_session' + deps='SAMDB talloc events ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS security-session' ) @@ -147,7 +147,7 @@ bld.SAMBA_MODULE('ldb_rootdse', subsystem='ldb', init_function='LDB_MODULE(rootdse)', internal_module=False, - deps='talloc events SAMDB MESSAGING security_session DSDB_MODULE_HELPERS' + deps='talloc events SAMDB MESSAGING security-session DSDB_MODULE_HELPERS' ) @@ -256,7 +256,7 @@ bld.SAMBA_MODULE('ldb_subtree_rename', subsystem='ldb', init_function='LDB_MODULE(subtree_rename)', internal_module=False, - deps='talloc events samba-util ldb samdb_common' + deps='talloc events samba-util ldb samdb-common' ) @@ -310,7 +310,7 @@ bld.SAMBA_MODULE('ldb_operational', subsystem='ldb', init_function='LDB_MODULE(operational)', internal_module=False, - deps='talloc tevent samba-util samdb_common DSDB_MODULE_HELPERS auth auth_session' + deps='talloc tevent samba-util samdb-common DSDB_MODULE_HELPERS auth auth_session' ) diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index a7e0895f08..269aa951c0 100644 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -6,12 +6,12 @@ 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='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', + 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' ) -bld.SAMBA_LIBRARY('samdb_common', +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, @@ -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/kdc/wscript_build b/source4/kdc/wscript_build index 89faffd49a..1433922268 100644 --- a/source4/kdc/wscript_build +++ b/source4/kdc/wscript_build @@ -11,7 +11,7 @@ bld.SAMBA_MODULE('KDC', bld.SAMBA_SUBSYSTEM('HDB_SAMBA4', source='hdb-samba4.c', - deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb db_glue samba-hostconfig com_err', + deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb db-glue samba-hostconfig com_err', includes='../heimdal/kdc', local_include=False ) @@ -33,7 +33,7 @@ bld.SAMBA_SUBSYSTEM('PAC_GLUE', ) -bld.SAMBA_LIBRARY('db_glue', +bld.SAMBA_LIBRARY('db-glue', source='db-glue.c', local_include=False, deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb samba-hostconfig com_err', @@ -44,14 +44,14 @@ 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 samba-hostconfig com_err' + deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb db-glue PAC_GLUE samba-hostconfig com_err' ) -bld.SAMBA_LIBRARY('mit_samba', - source='', - deps='MIT_SAMBA', - external_library=True, - realname='mit_samba.so' - ) +bld.SAMBA_LIBRARY('mit-samba', + source='', + deps='MIT_SAMBA', + external_library=True, + realname='mit_samba.so' + ) diff --git a/source4/ldap_server/wscript_build b/source4/ldap_server/wscript_build index 2c3798afc4..334d304dd4 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 samba-hostconfig samba_server_gensec' + deps='CREDENTIALS cli-ldap SAMDB process_model gensec samba-hostconfig samba_server_gensec' ) diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 502d492713..cdf13c3fd2 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -88,7 +88,7 @@ def build(bld): # this is only in the s4 build bld.SAMBA_MODULE('ldb_ildap', 'ldb_ildap/ldb_ildap.c', init_function='LDB_BACKEND(ldapi),LDB_BACKEND(ldaps),LDB_BACKEND(ldap)', - deps='talloc cli_ldap CREDENTIALS auth_system_session', + deps='talloc cli-ldap CREDENTIALS auth_system_session', aliases='ldb_ldaps ldb_ldapi ldb_ldap', internal_module=False, subsystem='ldb') diff --git a/source4/libcli/ldap/wscript_build b/source4/libcli/ldap/wscript_build index e8b9b9b260..a7b3717543 100644 --- a/source4/libcli/ldap/wscript_build +++ b/source4/libcli/ldap/wscript_build @@ -1,6 +1,6 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('cli_ldap', +bld.SAMBA_LIBRARY('cli-ldap', source='ldap_client.c ldap_bind.c ldap_ildap.c ldap_controls.c', autoproto='ldap_proto.h', public_deps='errors tevent LIBPACKET', diff --git a/source4/libcli/security/wscript_build b/source4/libcli/security/wscript_build index a39abf5c8e..9c277236c4 100644 --- a/source4/libcli/security/wscript_build +++ b/source4/libcli/security/wscript_build @@ -1,6 +1,6 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('security_session', +bld.SAMBA_LIBRARY('security-session', source='session.c', autoproto='session_proto.h', public_deps='security', diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build index be4aef147b..be2cd65828 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 ndr LIBCLI_RESOLVE LIBCLI_NETLOGON LIBCLI_RESOLVE' + public_deps='cli-nbt ndr LIBCLI_RESOLVE LIBCLI_NETLOGON LIBCLI_RESOLVE' ) @@ -65,21 +65,21 @@ 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 samba-hostconfig netif' + deps='cli-nbt samba-hostconfig netif' ) bld.SAMBA_SUBSYSTEM('LIBCLI_FINDDCS', source='finddcs_nbt.c finddcs_cldap.c', autoproto='finddcs_proto.h', - public_deps='cli_nbt MESSAGING RPC_NDR_IRPC LIBCLI_CLDAP' + public_deps='cli-nbt MESSAGING RPC_NDR_IRPC LIBCLI_CLDAP' ) 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 errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE cli_nbt security LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket' + public_deps='LIBCLI_RAW errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE cli-nbt security LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket' ) diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build index 4d0899c617..7417afe06a 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 ndr 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 f46981b952..6c0e679e31 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -17,7 +17,7 @@ bld.SAMBA_LIBRARY('ndr', bld.SAMBA_BINARY('ndrdump', source='../../librpc/tools/ndrdump.c', manpages='../../librpc/tools/ndrdump.1', - deps='samba-hostconfig samba-util popt POPT_SAMBA ndr_table errors' + deps='samba-hostconfig samba-util popt POPT_SAMBA ndr-table errors' ) @@ -105,7 +105,7 @@ bld.SAMBA_LIBRARY('ndr-standard', ) # create a grouping library to consolidate our samba4 specific NDR code -bld.SAMBA_LIBRARY('ndr_samba4', +bld.SAMBA_LIBRARY('ndr-samba4', source=[], deps='NDR_WINBIND NDR_IRPC NDR_NFS4ACL NDR_OPENDB NDR_NOTIFY', private_library=True, @@ -113,7 +113,7 @@ bld.SAMBA_LIBRARY('ndr_samba4', ) # a grouping library for RPC_NDR subsystems that may be used by more than one target -bld.SAMBA_LIBRARY('rpc_ndr_samba4', +bld.SAMBA_LIBRARY('dcerpc-samba4', source=[], deps='RPC_NDR_WINBIND', private_library=True, @@ -123,7 +123,7 @@ bld.SAMBA_LIBRARY('rpc_ndr_samba4', bld.SAMBA_PIDL_TABLES('GEN_NDR_TABLES', 'gen_ndr/tables.c') -bld.SAMBA_LIBRARY('ndr_table', +bld.SAMBA_LIBRARY('ndr-table', source='../../librpc/ndr/ndr_table.c gen_ndr/tables.c', public_deps='''ndr-standard NDR_AUDIOSRV NDR_DSBACKUP NDR_EFS NDR_DRSUAPI NDR_POLICYAGENT NDR_UNIXINFO NDR_SPOOLSS NDR_EPMAPPER @@ -152,7 +152,7 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_WINBIND', ) -bld.SAMBA_LIBRARY('dcerpc_samr', +bld.SAMBA_LIBRARY('dcerpc-samr', source='../../librpc/gen_ndr/ndr_samr_c.c', pc_files='dcerpc_samr.pc', vnum='0.0.1', @@ -167,7 +167,7 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_DNS', ) -bld.SAMBA_LIBRARY('dcerpc_atsvc', +bld.SAMBA_LIBRARY('dcerpc-atsvc', source='../../librpc/gen_ndr/ndr_atsvc_c.c', pc_files='dcerpc_atsvc.pc', vnum='0.0.1', @@ -214,7 +214,7 @@ bld.SAMBA_SUBSYSTEM('pyrpc_util', bld.SAMBA_PYTHON('python_dcerpc', source='rpc/pyrpc.c', - public_deps='LIBCLI_SMB samba-util samba-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' ) @@ -263,7 +263,7 @@ bld.SAMBA_PYTHON('python_mgmt', bld.SAMBA_PYTHON('python_atsvc', source='../../librpc/gen_ndr/py_atsvc.c', - deps='dcerpc_atsvc PYTALLOC pyrpc_util', + deps='dcerpc-atsvc PYTALLOC pyrpc_util', realname='samba/dcerpc/atsvc.so' ) @@ -277,7 +277,7 @@ bld.SAMBA_PYTHON('python_dcerpc_nbt', bld.SAMBA_PYTHON('python_samr', source='../../librpc/gen_ndr/py_samr.c', - deps='dcerpc_samr PYTALLOC pyrpc_util', + deps='dcerpc-samr PYTALLOC pyrpc_util', realname='samba/dcerpc/samr.so' ) diff --git a/source4/nbt_server/wscript_build b/source4/nbt_server/wscript_build index 13058adcc0..42ef68e6aa 100644 --- a/source4/nbt_server/wscript_build +++ b/source4/nbt_server/wscript_build @@ -19,7 +19,7 @@ bld.SAMBA_MODULE('ldb_wins_ldb', bld.SAMBA_SUBSYSTEM('NBTD_WINS', source='wins/winsserver.c wins/winsclient.c wins/winswack.c wins/wins_dns_proxy.c', autoproto='wins/winsserver_proto.h', - deps='cli_nbt WINSDB' + deps='cli-nbt WINSDB' ) @@ -33,7 +33,7 @@ bld.SAMBA_SUBSYSTEM('NBTD_DGRAM', bld.SAMBA_SUBSYSTEM('NBT_SERVER', source='interfaces.c register.c query.c nodestatus.c defense.c packet.c irpc.c', autoproto='nbt_server_proto.h', - deps='cli_nbt NBTD_WINS NBTD_DGRAM' + deps='cli-nbt NBTD_WINS NBTD_DGRAM' ) diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build index 5eb77b7524..81a6a9f8c2 100644 --- a/source4/rpc_server/wscript_build +++ b/source4/rpc_server/wscript_build @@ -35,7 +35,7 @@ bld.SAMBA_MODULE('dcerpc_remote', source='remote/dcesrv_remote.c', subsystem='dcerpc_server', init_function='dcerpc_server_remote_init', - deps='LIBCLI_SMB ndr_table' + deps='LIBCLI_SMB ndr-table' ) @@ -77,7 +77,7 @@ bld.SAMBA_MODULE('dcerpc_winreg', source='winreg/rpc_winreg.c', subsystem='dcerpc_server', init_function='dcerpc_server_winreg_init', - deps='registry ndr-standard security_session', + deps='registry ndr-standard security-session', internal_module=True ) @@ -95,7 +95,7 @@ bld.SAMBA_MODULE('dcerpc_lsarpc', autoproto='lsa/proto.h', subsystem='dcerpc_server', init_function='dcerpc_server_lsa_init', - deps='SAMDB DCERPC_COMMON ndr-standard LIBCLI_AUTH NDR_DSSETUP com_err security_session' + deps='SAMDB DCERPC_COMMON ndr-standard LIBCLI_AUTH NDR_DSSETUP com_err security-session' ) @@ -112,7 +112,7 @@ bld.SAMBA_MODULE('dcerpc_drsuapi', source='drsuapi/dcesrv_drsuapi.c drsuapi/updaterefs.c drsuapi/getncchanges.c drsuapi/addentry.c drsuapi/writespn.c drsuapi/drsutil.c', subsystem='dcerpc_server', init_function='dcerpc_server_drsuapi_init', - deps='SAMDB DCERPC_COMMON NDR_DRSUAPI security_session' + deps='SAMDB DCERPC_COMMON NDR_DRSUAPI security-session' ) diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build index 8d17a12804..8b3375b548 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 samba-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='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 samba-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 363df08e83..cb8338231a 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 samba-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 samba-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 ) @@ -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' @@ -114,7 +114,7 @@ bld.SAMBA_MODULE('TORTURE_NBT', autoproto='nbt/proto.h', subsystem='smbtorture', init_function='torture_nbt_init', - deps='LIBCLI_SMB cli_nbt LIBCLI_DGRAM LIBCLI_WREPL torture_rpc', + deps='LIBCLI_SMB cli-nbt LIBCLI_DGRAM LIBCLI_WREPL torture_rpc', internal_module=True ) diff --git a/source4/winbind/wscript_build b/source4/winbind/wscript_build index 263c065183..46f5294ea4 100644 --- a/source4/winbind/wscript_build +++ b/source4/winbind/wscript_build @@ -6,20 +6,20 @@ 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 cli_ldap samba-net LIBSAMBA_TSOCKET' + deps='WB_HELPER IDMAP NDR_WINBIND process_model RPC_NDR_LSA dcerpc-samr PAM_ERRORS cli-ldap samba-net LIBSAMBA_TSOCKET' ) bld.SAMBA_SUBSYSTEM('WB_HELPER', source='wb_async_helpers.c wb_utils.c', autoproto='wb_helper.h', - public_deps='RPC_NDR_LSA dcerpc_samr' + public_deps='RPC_NDR_LSA dcerpc-samr' ) bld.SAMBA_SUBSYSTEM('IDMAP', source='idmap.c', autoproto='idmap_proto.h', - public_deps='samdb_common LDBSAMBA' + public_deps='samdb-common LDBSAMBA' ) |