summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2013-09-23 08:32:01 +0200
committerMichael Adam <obnox@samba.org>2013-09-23 20:23:17 +0200
commite03ddd1f0eaf093a942ed89a92adbff746c3cc85 (patch)
treecc1f6afe76c718ebfb652afbc4557e102cc358c1
parent6ffbcfbbb66f659bfe7a05813d459a30523c9ae2 (diff)
downloadsamba-e03ddd1f0eaf093a942ed89a92adbff746c3cc85.tar.gz
samba-e03ddd1f0eaf093a942ed89a92adbff746c3cc85.tar.bz2
samba-e03ddd1f0eaf093a942ed89a92adbff746c3cc85.zip
build: list sources of library libsmb directly in def, also removing vars=locals()
Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rwxr-xr-xsource3/wscript_build43
1 files changed, 26 insertions, 17 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 282e7fb260..68fcd1579f 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,21 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
- libsmb/clispnego.c
- libsmb/clirap.c libsmb/clierror.c libsmb/climessage.c
- libsmb/clireadwrite.c libsmb/clilist.c libsmb/cliprint.c
- libsmb/clitrans.c libsmb/clisecdesc.c libsmb/clidgram.c
- libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c
- libsmb/clioplock.c libsmb/clirap2.c
- libsmb/async_smb.c
- libsmb/smb2cli_tcon.c
- libsmb/cli_np_tstream.c
- libsmb/reparse_symlink.c
- libsmb/clisymlink.c
- libsmb/smbsock_connect.c
- libsmb/cli_smb2_fnum.c'''
-
LIBMSRPC_SRC = '''
rpc_client/cli_pipe.c
rpc_client/rpc_transport_np.c
@@ -688,7 +673,32 @@ bld.SAMBA3_SUBSYSTEM('auth_generic',
vars=locals())
bld.SAMBA3_LIBRARY('libsmb',
- source=LIBSMB_SRC,
+ source='''libsmb/clientgen.c
+ libsmb/cliconnect.c
+ libsmb/clifile.c
+ libsmb/clispnego.c
+ libsmb/clirap.c
+ libsmb/clierror.c
+ libsmb/climessage.c
+ libsmb/clireadwrite.c
+ libsmb/clilist.c
+ libsmb/cliprint.c
+ libsmb/clitrans.c
+ libsmb/clisecdesc.c
+ libsmb/clidgram.c
+ libsmb/clistr.c
+ libsmb/cliquota.c
+ libsmb/clifsinfo.c
+ libsmb/clidfs.c
+ libsmb/clioplock.c
+ libsmb/clirap2.c
+ libsmb/async_smb.c
+ libsmb/smb2cli_tcon.c
+ libsmb/cli_np_tstream.c
+ libsmb/reparse_symlink.c
+ libsmb/clisymlink.c
+ libsmb/smbsock_connect.c
+ libsmb/cli_smb2_fnum.c''',
deps='''
LIBNTLMSSP
auth_generic
@@ -700,7 +710,6 @@ bld.SAMBA3_LIBRARY('libsmb',
cli_smb_common
util_cmdline
tevent''',
- vars=locals(),
private_library=True)
bld.SAMBA3_SUBSYSTEM('CLDAP',