summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-24 16:25:29 -0600
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:06 +1000
commit8f5551c4b3bc56a64f4c8f260821114b23fad693 (patch)
tree1195b40800aff7c190925e9d3dd7ccb1e8a8566a
parent239cdb53f4e994c8fd4afe1233e69b93ad632230 (diff)
downloadsamba-8f5551c4b3bc56a64f4c8f260821114b23fad693.tar.gz
samba-8f5551c4b3bc56a64f4c8f260821114b23fad693.tar.bz2
samba-8f5551c4b3bc56a64f4c8f260821114b23fad693.zip
s3-waf: use new variable expansion feature
-rw-r--r--source3/wscript_build14
1 files changed, 3 insertions, 11 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index a851c78eaf..8145f77df4 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -575,15 +575,6 @@ PRINTBACKEND_SRC = 'printing/printing.c printing/nt_printing.c ${PRINTBASE_SRC}'
SMBD_SRC = '''${SMBD_SRC_BASE} ${SMBD_SRC_MAIN}'''
-def EXPAND_VARIABLES(varstr, envlist):
- import Environment
- env = Environment.Environment()
- for v in envlist:
- env[v] = eval(v)
- return SUBST_VARS_RECURSIVE(varstr, env)
-
-src =EXPAND_VARIABLES(SMBD_SRC, dir())
-
bld.env.AWK = 'gawk'
bld.SAMBA_GENERATOR('build_options',
@@ -598,8 +589,9 @@ print "SBINDIR=%s" % bld.env.SBINDIR
bld.BUILD_SUBDIR('build')
bld.SAMBA_BINARY('smbd/smbd',
- source=src,
- deps='tdb DYNCONFIG')
+ source=SMBD_SRC,
+ deps='tdb DYNCONFIG',
+ vars=locals())
bld.BUILD_SUBDIR('../lib/socket_wrapper')
bld.BUILD_SUBDIR('../lib/talloc')