summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-09-15 12:52:49 +0200
committerGünther Deschner <gd@samba.org>2011-09-15 15:31:59 +0200
commitbd5445ee4f663d18197dbb01078cc21342dd5045 (patch)
tree65fa6819f61432c1c701a8ec9b9946ad88db5c84
parentef8dc2d30e5387b38ac1a05eaece8f22326a24f8 (diff)
downloadsamba-bd5445ee4f663d18197dbb01078cc21342dd5045.tar.gz
samba-bd5445ee4f663d18197dbb01078cc21342dd5045.tar.bz2
samba-bd5445ee4f663d18197dbb01078cc21342dd5045.zip
waf: restore libsmbclient handling.
This is a temporary solution to get libsmbclient installed properly as a library (including symlinks and proper symbols). I was not able to make the old internal library name 'libsmb/smbclient' work together with "realname" and/or "link_name". Maybe one of the waf gurus has more ideas here. Guenther Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Thu Sep 15 15:31:59 CEST 2011 on sn-devel-104
-rwxr-xr-xsource3/wscript_build6
-rw-r--r--source4/torture/libsmbclient/wscript_build2
-rw-r--r--source4/wscript_build (renamed from source4/client/wscript_build)9
-rw-r--r--wscript_build2
4 files changed, 9 insertions, 10 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index bca1cdf8a3..4bedbfe032 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/torture/libsmbclient/wscript_build b/source4/torture/libsmbclient/wscript_build
index 8b2c516dbf..40c7932a20 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/client/wscript_build b/source4/wscript_build
index d1622b3d1d..06b9e487e3 100644
--- a/source4/client/wscript_build
+++ b/source4/wscript_build
@@ -1,13 +1,12 @@
#!/usr/bin/env python
-bld.SAMBA_BINARY('smbclient',
- source='client.c',
+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('cifsdd',
- source='cifsdd.c cifsddio.c',
+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 1b6fb31e41..4f61820224 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')