summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba/wafsamba.py
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2012-09-06 12:14:34 +0200
committerAndreas Schneider <asn@cryptomilk.org>2012-09-07 10:48:57 +0200
commit802708b410b6367c01d968565f3f5e3a8751522d (patch)
treeb5c9b27c8d6bc7babf8e44594c772cc4449c9f60 /buildtools/wafsamba/wafsamba.py
parent18eb505b895efae8b723ff3ecddc7c528c34b391 (diff)
downloadsamba-802708b410b6367c01d968565f3f5e3a8751522d.tar.gz
samba-802708b410b6367c01d968565f3f5e3a8751522d.tar.bz2
samba-802708b410b6367c01d968565f3f5e3a8751522d.zip
wafsamba: Add a CONFIGURE_FILE option.
Diffstat (limited to 'buildtools/wafsamba/wafsamba.py')
-rw-r--r--buildtools/wafsamba/wafsamba.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 1fb1241024..64624d71d5 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -31,6 +31,7 @@ import samba_wildcard
import stale_files
import symbols
import pkgconfig
+import configure_file
# some systems have broken threading in python
if os.environ.get('WAF_NOTHREADS') == '1':
@@ -579,6 +580,12 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='',
if not enabled:
return
+ dep_vars = []
+ if isinstance(vars, dict):
+ dep_vars = vars.keys()
+ elif isinstance(vars, list):
+ dep_vars = vars
+
bld.SET_BUILD_GROUP(group)
t = bld(
rule=rule,
@@ -589,7 +596,7 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='',
before='cc',
ext_out='.c',
samba_type='GENERATOR',
- dep_vars = [rule] + (vars or []),
+ dep_vars = [rule] + dep_vars,
name=name)
if always: