summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2013-09-23 07:51:12 +0200
committerMichael Adam <obnox@samba.org>2013-09-23 20:22:37 +0200
commit2b4d1affe8e507b1da996ac8a8663db71bd84f24 (patch)
tree5b3fee024c6645baf0d6c95cf267ab98b2057fc4
parent928c23705e7ac9c23a2b735f8604aef7fadfb33d (diff)
downloadsamba-2b4d1affe8e507b1da996ac8a8663db71bd84f24.tar.gz
samba-2b4d1affe8e507b1da996ac8a8663db71bd84f24.tar.bz2
samba-2b4d1affe8e507b1da996ac8a8663db71bd84f24.zip
build: list sources of subsystem samba3util directly in definition and remove vars=locals()
Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rwxr-xr-xsource3/wscript_build26
1 files changed, 11 insertions, 15 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index b177ef0147..ef9081cd70 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,18 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIB_UTIL_SRC = '''
- lib/system.c
- lib/sendfile.c
- lib/recvfile.c
- lib/time.c
- lib/util_sid.c
- lib/util_file.c
- lib/util.c
- lib/util_sock.c
- lib/util_transfer_file.c
- lib/sock_exec.c'''
-
POPT_LIB_SRC = '''lib/popt_common.c'''
PARAM_UTIL_SRC = '''param/util.c'''
@@ -645,9 +633,17 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
vars=locals())
bld.SAMBA3_SUBSYSTEM('samba3util',
- source=LIB_UTIL_SRC,
- deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash',
- vars=locals())
+ source='''lib/system.c
+ lib/sendfile.c
+ lib/recvfile.c
+ lib/time.c
+ lib/util_sid.c
+ lib/util_file.c
+ lib/util.c
+ lib/util_sock.c
+ lib/util_transfer_file.c
+ lib/sock_exec.c''',
+ deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash')
bld.SAMBA3_SUBSYSTEM('TDB_LIB',