diff options
Diffstat (limited to 'source4')
-rw-r--r-- | source4/client/wscript_build | 2 | ||||
-rw-r--r-- | source4/libcli/rap/wscript_build | 2 | ||||
-rw-r--r-- | source4/libcli/smb2/wscript_build | 2 | ||||
-rw-r--r-- | source4/libcli/wscript_build | 4 | ||||
-rwxr-xr-x | source4/librpc/wscript_build | 2 | ||||
-rw-r--r-- | source4/ntvfs/wscript_build | 4 | ||||
-rw-r--r-- | source4/torture/wscript_build | 6 |
7 files changed, 11 insertions, 11 deletions
diff --git a/source4/client/wscript_build b/source4/client/wscript_build index f542575265..94b579c0d5 100644 --- a/source4/client/wscript_build +++ b/source4/client/wscript_build @@ -2,7 +2,7 @@ bld.SAMBA_BINARY('smbclient', source='client.c', - deps='samba-hostconfig SMBREADLINE samba-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 cli_raw' ) diff --git a/source4/libcli/rap/wscript_build b/source4/libcli/rap/wscript_build index 32685cb77d..eac7b90675 100644 --- a/source4/libcli/rap/wscript_build +++ b/source4/libcli/rap/wscript_build @@ -2,6 +2,6 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_RAP', source='rap.c', - public_deps='LIBCLI_RAW NDR_RAP', + public_deps='cli_raw NDR_RAP', autoproto='proto.h' ) diff --git a/source4/libcli/smb2/wscript_build b/source4/libcli/smb2/wscript_build index 5b5ac7d4e6..fc8e7b4f36 100644 --- a/source4/libcli/smb2/wscript_build +++ b/source4/libcli/smb2/wscript_build @@ -4,6 +4,6 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SMB2', source='transport.c request.c negprot.c session.c tcon.c create.c close.c connect.c getinfo.c write.c read.c setinfo.c find.c ioctl.c logoff.c tdis.c flush.c lock.c notify.c cancel.c keepalive.c break.c util.c signing.c lease_break.c', autoproto='smb2_proto.h', deps='UTIL_TEVENT', - public_deps='LIBCLI_RAW LIBPACKET gensec tevent' + public_deps='cli_raw LIBPACKET gensec tevent' ) diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build index 0a7b85ed01..ce4eeadcce 100644 --- a/source4/libcli/wscript_build +++ b/source4/libcli/wscript_build @@ -70,11 +70,11 @@ 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 errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE cli-nbt security LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket' + public_deps='cli_raw errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE cli-nbt security LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket' ) -bld.SAMBA_LIBRARY('LIBCLI_RAW', +bld.SAMBA_LIBRARY('cli_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 LIBCRYPTO', diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index 39541b6a33..68141f6193 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -138,7 +138,7 @@ bld.SAMBA_LIBRARY('dcerpc', rpc/dcerpc_util.c rpc/dcerpc_smb.c rpc/dcerpc_smb2.c rpc/dcerpc_sock.c rpc/dcerpc_connect.c rpc/dcerpc_secondary.c''', pc_files='dcerpc.pc', - 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 rpccommon', + 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 cli_raw LP_RESOLVE UTIL_TEVENT rpccommon', autoproto='rpc/dcerpc_proto.h', public_deps='credentials tevent talloc', public_headers='''rpc/dcerpc.h ../../librpc/gen_ndr/mgmt.h diff --git a/source4/ntvfs/wscript_build b/source4/ntvfs/wscript_build index 43a6cd647f..24ce18f307 100644 --- a/source4/ntvfs/wscript_build +++ b/source4/ntvfs/wscript_build @@ -9,7 +9,7 @@ bld.SAMBA_MODULE('ntvfs_cifs', source='cifs/vfs_cifs.c', subsystem='ntvfs', init_function='ntvfs_cifs_init', - deps='LIBCLI_SMB LIBCLI_RAW' + deps='LIBCLI_SMB cli_raw' ) @@ -17,7 +17,7 @@ bld.SAMBA_MODULE('ntvfs_smb2', source='smb2/vfs_smb2.c', subsystem='ntvfs', init_function='ntvfs_smb2_init', - deps='LIBCLI_SMB LIBCLI_RAW' + deps='LIBCLI_SMB cli_raw' ) diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build index 106cc64280..fbae17ee61 100644 --- a/source4/torture/wscript_build +++ b/source4/torture/wscript_build @@ -4,14 +4,14 @@ bld.SAMBA_SUBSYSTEM('TORTURE_UTIL', source='util_smb.c', public_deps='torture POPT_CREDENTIALS', - deps='LIBCLI_RAW' + deps='cli_raw' ) bld.SAMBA_MODULE('TORTURE_BASIC', source='basic/base.c basic/misc.c basic/scanner.c basic/utable.c basic/charset.c basic/mangle_test.c basic/denytest.c basic/aliases.c basic/locking.c basic/secleak.c basic/rename.c basic/dir.c basic/delete.c basic/unlink.c basic/disconnect.c basic/delaywrite.c basic/attr.c basic/properties.c', subsystem='smbtorture', - deps='LIBCLI_SMB POPT_CREDENTIALS TORTURE_UTIL LIBCLI_RAW TORTURE_RAW', + deps='LIBCLI_SMB POPT_CREDENTIALS TORTURE_UTIL cli_raw TORTURE_RAW', internal_module=True, autoproto='basic/proto.h', init_function='torture_base_init' @@ -157,7 +157,7 @@ bld.SAMBA_BINARY('smbtorture', bld.SAMBA_BINARY('gentest', source='gentest.c', manpages='man/gentest.1', - deps='samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB LIBCLI_RAW' + deps='samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB cli_raw' ) |