diff options
Diffstat (limited to 'libsmbclient.diff')
| -rw-r--r-- | libsmbclient.diff | 102 |
1 files changed, 102 insertions, 0 deletions
diff --git a/libsmbclient.diff b/libsmbclient.diff new file mode 100644 index 0000000..25b1bfa --- /dev/null +++ b/libsmbclient.diff @@ -0,0 +1,102 @@ + source3/wscript_build | 6 +++--- + source4/client/wscript_build | 13 ------------- + source4/torture/libsmbclient/wscript_build | 2 +- + source4/wscript_build | 13 +++++++++++++ + wscript_build | 2 +- + 5 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/source3/wscript_build b/source3/wscript_build +index bca1cdf..4bedbfe 100755 +--- a/source3/wscript_build ++++ b/source3/wscript_build +@@ -675,7 +675,7 @@ bld.SAMBA3_LIBRARY('netapi', + vnum='0', + vars=locals()) + +-bld.SAMBA3_LIBRARY('libsmb/smbclient', ++bld.SAMBA3_LIBRARY('smbclient', + source=LIBSMBCLIENT_SRC, + public_deps='''talloc tdb_compat wbclient cap param smbd_shim libsmb KRBCLIENT pdb SMBLDAP + LIBMSRPC_GEN msrpc3 libcli_lsa3 RPC_NDR_SRVSVC popt_samba3''', +@@ -1175,7 +1175,7 @@ bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3, + source=CLIENT_SRC, + deps='''talloc tdb_compat cap popt_samba3 pdb libsmb smbd_shim + param wbclient param KRBCLIENT LIBMSRPC_GEN +- msrpc3 SMBREADLINE libsmb/smbclient RPC_NDR_SRVSVC INIT_LSA ++ msrpc3 SMBREADLINE smbclient RPC_NDR_SRVSVC INIT_LSA + cli_smb_common''', + vars=locals()) + +@@ -1252,7 +1252,7 @@ bld.SAMBA3_BINARY('pdbedit', + + bld.SAMBA3_BINARY('smbget', + source=SMBGET_SRC, +- deps='''talloc tdb_compat libsmb/smbclient popt_samba3''', ++ deps='''talloc tdb_compat smbclient popt_samba3''', + vars=locals()) + + bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3, +diff --git a/source4/client/wscript_build b/source4/client/wscript_build +deleted file mode 100644 +index d1622b3..0000000 +--- a/source4/client/wscript_build ++++ /dev/null +@@ -1,13 +0,0 @@ +-#!/usr/bin/env python +- +-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 smbclient-raw' +- ) +- +- +-bld.SAMBA_BINARY('cifsdd', +- source='cifsdd.c cifsddio.c', +- deps='samba-hostconfig LIBCLI_SMB popt POPT_SAMBA POPT_CREDENTIALS' +- ) +- +diff --git a/source4/torture/libsmbclient/wscript_build b/source4/torture/libsmbclient/wscript_build +index 8b2c516..40c7932 100644 +--- a/source4/torture/libsmbclient/wscript_build ++++ b/source4/torture/libsmbclient/wscript_build +@@ -6,7 +6,7 @@ bld.SAMBA_MODULE('TORTURE_LIBSMBCLIENT', + autoproto='proto.h', + subsystem='smbtorture', + init_function='torture_libsmbclient_init', +- deps='POPT_CREDENTIALS libsmb/smbclient', ++ deps='POPT_CREDENTIALS smbclient', + internal_module=True + ) + +diff --git a/source4/wscript_build b/source4/wscript_build +new file mode 100644 +index 0000000..a7b8932 +--- /dev/null ++++ b/source4/wscript_build +@@ -0,0 +1,13 @@ ++#!/usr/bin/env python ++ ++bld.SAMBA_BINARY('client/smbclient', ++ source='client/client.c', ++ deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS smbclient-raw' ++ ) ++ ++ ++bld.SAMBA_BINARY('client/cifsdd', ++ source='client/cifsdd.c client/cifsddio.c', ++ deps='samba-hostconfig LIBCLI_SMB popt POPT_SAMBA POPT_CREDENTIALS' ++ ) ++ +diff --git a/wscript_build b/wscript_build +index 1b6fb31..4f61820 100644 +--- a/wscript_build ++++ b/wscript_build +@@ -90,7 +90,7 @@ bld.RECURSE('source4/ntvfs') + bld.RECURSE('source4/ntptr') + bld.RECURSE('source4/torture') + bld.RECURSE('librpc') +-bld.RECURSE('source4/client') ++bld.RECURSE('source4') + bld.RECURSE('source4/libcli') + bld.RECURSE('libcli/smb') + bld.RECURSE('libcli/util') |