build: list source of library popt_samba3 directly in definition and rm vars=locals()

[nivanova/samba-autobuild/.git] / source3 / wscript_build

diff --git a/source3/wscript_build b/source3/wscript_build
index b177ef0147c31201968b76698722f9943ce74e6c..77a42aaff2b216528131ccd053ad5653177294ea 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,20 +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'''
 
 PARAM_WITHOUT_REG_SRC = '''param/loadparm.c
@@ -629,9 +615,8 @@ bld.SAMBA3_SUBSYSTEM('REG_FULL',
                     vars=locals())
 
 bld.SAMBA3_LIBRARY('popt_samba3',
-                   source=POPT_LIB_SRC,
+                   source='lib/popt_common.c',
                    deps='popt samba-util util_cmdline',
-                   vars=locals(),
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('util_cmdline',
@@ -645,9 +630,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',