diff options
| author | Günther Deschner <gd@samba.org> | 2011-09-15 12:52:49 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-09-15 15:31:59 +0200 |
| commit | bd5445ee4f663d18197dbb01078cc21342dd5045 (patch) | |
| tree | 65fa6819f61432c1c701a8ec9b9946ad88db5c84 /source4 | |
| parent | ef8dc2d30e5387b38ac1a05eaece8f22326a24f8 (diff) | |
| download | samba-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
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/torture/libsmbclient/wscript_build | 2 | ||||
| -rw-r--r-- | source4/wscript_build (renamed from source4/client/wscript_build) | 9 |
2 files changed, 5 insertions, 6 deletions
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' ) - |