diff options
| -rw-r--r-- | librpc/wscript_build | 2 | ||||
| -rw-r--r-- | source4/dns_server/wscript_build | 2 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/wscript_build | 2 | ||||
| -rw-r--r-- | source4/lib/com/wscript_build | 2 | ||||
| -rw-r--r-- | source4/lib/registry/wscript_build | 2 | ||||
| -rw-r--r-- | source4/lib/samba3/wscript_build | 2 | ||||
| -rw-r--r-- | source4/libcli/wscript_build | 4 | ||||
| -rwxr-xr-x | source4/librpc/wscript_build | 6 | ||||
| -rw-r--r-- | source4/param/wscript_build | 2 | ||||
| -rw-r--r-- | source4/smb_server/wscript_build | 2 |
10 files changed, 13 insertions, 13 deletions
diff --git a/librpc/wscript_build b/librpc/wscript_build index 83db7e7ebc..1ba1fc66e7 100644 --- a/librpc/wscript_build +++ b/librpc/wscript_build @@ -481,7 +481,7 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_KEYSVC', # a grouping library for NDR subsystems that may be used by more than one target bld.SAMBA_LIBRARY('ndr-samba', source=[], - deps='NDR_DRSBLOBS NDR_DRSUAPI NDR_IDMAP NDR_NTLMSSP NDR_SCHANNEL NDR_MGMT NDR_KRB5PAC NDR_DNSP NDR_EPMAPPER NDR_XATTR NDR_UNIXINFO NDR_NAMED_PIPE_AUTH', + deps='NDR_DRSBLOBS NDR_DRSUAPI NDR_IDMAP NDR_NTLMSSP NDR_SCHANNEL NDR_MGMT NDR_KRB5PAC NDR_DNSP NDR_EPMAPPER NDR_XATTR NDR_UNIXINFO NDR_NAMED_PIPE_AUTH NDR_DCOM', private_library=True, grouping_library=True ) diff --git a/source4/dns_server/wscript_build b/source4/dns_server/wscript_build index cb17f22c80..45dae0c87a 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', + 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 6650f0bc6b..398b5932d7 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -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 SAMDB' ) diff --git a/source4/lib/com/wscript_build b/source4/lib/com/wscript_build index 3b8b0a1468..ad716ef72f 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='samba-util samba-hostconfig events ndr PIDL_DCOM' + deps='samba-util samba-hostconfig events ndr NDR_DCOM' ) diff --git a/source4/lib/registry/wscript_build b/source4/lib/registry/wscript_build index ad1139681b..a61c36d73b 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 CHARSET 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/lib/samba3/wscript_build b/source4/lib/samba3/wscript_build index 2e47a15eaa..51ac747f4d 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 samba-util', + deps='samba-util', private_library=True ) diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build index be2cd65828..01bd64cfc9 100644 --- a/source4/libcli/wscript_build +++ b/source4/libcli/wscript_build @@ -86,8 +86,8 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SMB', 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 ndr' + public_deps='samba_socket LIBPACKET LIBCRYPTO', + deps='LIBCLI_COMPOSITE LIBCLI_RESOLVE security ndr samba-util errors CHARSET talloc LIBCLI_SMB_COMPOSITE tevent NDR_NBT_BUF LIBCLI_SMB_COMMON' ) bld.RECURSE('smb2') diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index 6cd7858252..39e4999780 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -6,7 +6,7 @@ bld.RECURSE('idl') 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 samba-util CHARSET', + public_deps='errors talloc samba-util', 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', @@ -24,7 +24,7 @@ bld.SAMBA_BINARY('ndrdump', 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='ndr', + deps='ndr security', public_headers='../../librpc/gen_ndr/security.h gen_ndr/server_id.h', header_path='gen_ndr' ) @@ -107,7 +107,7 @@ bld.SAMBA_LIBRARY('ndr-standard', # create a grouping library to consolidate our samba4 specific NDR code bld.SAMBA_LIBRARY('ndr-samba4', source=[], - deps='NDR_WINBIND NDR_IRPC NDR_NFS4ACL NDR_OPENDB NDR_NOTIFY', + deps='NDR_WINBIND NDR_IRPC NDR_NFS4ACL NDR_OPENDB NDR_NOTIFY ndr-table', private_library=True, grouping_library=True ) diff --git a/source4/param/wscript_build b/source4/param/wscript_build index 3039236bef..e65bc017d8 100644 --- a/source4/param/wscript_build +++ b/source4/param/wscript_build @@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('samba-hostconfig', source='loadparm.c generic.c util.c', pc_files='samba-hostconfig.pc', vnum='0.0.1', - deps='DYNCONFIG CHARSET', + deps='DYNCONFIG', public_deps='samba-util', public_headers='param.h', autoproto='param_proto.h', diff --git a/source4/smb_server/wscript_build b/source4/smb_server/wscript_build index 45e697b7af..3ecbf247d1 100644 --- a/source4/smb_server/wscript_build +++ b/source4/smb_server/wscript_build @@ -5,7 +5,7 @@ bld.SAMBA_MODULE('SERVICE_SMB', autoproto='service_smb_proto.h', subsystem='service', init_function='server_service_smb_init', - deps='SMB_SERVER', + deps='SMB_SERVER netif shares samba-hostconfig', internal_module=True ) |