From bd5445ee4f663d18197dbb01078cc21342dd5045 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 15 Sep 2011 12:52:49 +0200 Subject: waf: restore libsmbclient handling. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Autobuild-Date: Thu Sep 15 15:31:59 CEST 2011 on sn-devel-104 --- source4/client/wscript_build | 13 ------------- source4/torture/libsmbclient/wscript_build | 2 +- source4/wscript_build | 12 ++++++++++++ 3 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 source4/client/wscript_build create mode 100644 source4/wscript_build (limited to 'source4') diff --git a/source4/client/wscript_build b/source4/client/wscript_build deleted file mode 100644 index d1622b3d1d..0000000000 --- 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 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/wscript_build b/source4/wscript_build new file mode 100644 index 0000000000..06b9e487e3 --- /dev/null +++ b/source4/wscript_build @@ -0,0 +1,12 @@ +#!/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' + ) -- cgit