From 07d9da4d2f77d08c3a073453f4eaaf5c0939ccf5 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 6 Apr 2010 19:31:39 +1000 Subject: build: use a target_in_list() function for more flexible builtin control --- buildtools/wafsamba/samba_bundled.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'buildtools/wafsamba/samba_bundled.py') diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index 34199381b3..e0a8e54eae 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -15,14 +15,25 @@ def BUNDLED_NAME(bld, name, bundled_extension): return name +def target_in_list(target, lst, default): + for l in lst: + if target == l: + return True + if '!' + target == l: + return False + if l == 'ALL': + return True + if l == 'NONE': + return False + return default + + def BUILTIN_LIBRARY(bld, name): '''return True if a library should be builtin instead of being built as a shared lib''' if bld.env.DISABLE_SHARED: return True - if name in bld.env.BUILTIN_LIBRARIES: - return True - return False + return target_in_list(name, bld.env.BUILTIN_LIBRARIES, False) def BUILTIN_DEFAULT(opt, builtins): -- cgit