diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-25 12:41:41 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-26 14:36:54 +1000 |
| commit | 6c79b9f4807f932ad9d09ebfa708d7a75fa35f45 (patch) | |
| tree | 09c0c2b4554f14a1c7bb2c71fcb2fa3fef50ffdd | |
| parent | fd3eeb3878c94bfb8d2134dbdc17cfb5279d088c (diff) | |
| download | samba-6c79b9f4807f932ad9d09ebfa708d7a75fa35f45.tar.gz samba-6c79b9f4807f932ad9d09ebfa708d7a75fa35f45.tar.bz2 samba-6c79b9f4807f932ad9d09ebfa708d7a75fa35f45.zip | |
build: cope with duplicates in source lists
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 95410aac6e..56ecfb1df3 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -239,6 +239,7 @@ def SAMBA_BINARY(bld, binname, source, obj_target = binname + '.objlist' source = bld.EXPAND_VARIABLES(source, vars=vars) + source = unique_list(TO_LIST(source)) # first create a target for building the object files for this binary # by separating in this way, we avoid recompiling the C files @@ -325,6 +326,7 @@ def SAMBA_MODULE(bld, modname, source, return source = bld.EXPAND_VARIABLES(source, vars=vars) + source = unique_list(TO_LIST(source)) # remember empty modules, so we can strip the dependencies if (source == '') or (source == []): @@ -349,7 +351,7 @@ def SAMBA_MODULE(bld, modname, source, ) if autoproto is not None: - bld.SAMBA_AUTOPROTO(autoproto, source + ' ' + autoproto_extra_source) + bld.SAMBA_AUTOPROTO(autoproto, source + TO_LIST(autoproto_extra_source)) Build.BuildContext.SAMBA_MODULE = SAMBA_MODULE @@ -395,6 +397,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source, return source = bld.EXPAND_VARIABLES(source, vars=vars) + source = unique_list(TO_LIST(source)) deps += ' ' + public_deps @@ -427,7 +430,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source, if heimdal_autoproto_private is not None: bld.HEIMDAL_AUTOPROTO_PRIVATE(heimdal_autoproto_private, source) if autoproto is not None: - bld.SAMBA_AUTOPROTO(autoproto, source + ' ' + autoproto_extra_source) + bld.SAMBA_AUTOPROTO(autoproto, source + TO_LIST(autoproto_extra_source)) if public_headers is not None: bld.PUBLIC_HEADERS(public_headers, header_path=header_path) return t |