diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-06-15 20:35:22 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-06-15 20:35:22 +0200 |
| commit | 773e47f4a9c1601284eefac1efc8c139fdf2907a (patch) | |
| tree | 68f0e3c2e5ae52d9064ec6063bf04e9dead6d64e /buildtools/wafsamba | |
| parent | d913aacfe47153b927c537cd5869ba62eadfb676 (diff) | |
| download | samba-773e47f4a9c1601284eefac1efc8c139fdf2907a.tar.gz samba-773e47f4a9c1601284eefac1efc8c139fdf2907a.tar.bz2 samba-773e47f4a9c1601284eefac1efc8c139fdf2907a.zip | |
wafsamba: Fix include path inheritance from module subsystems.
Diffstat (limited to 'buildtools/wafsamba')
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 666a282540..fbb1726f82 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -330,9 +330,12 @@ def SAMBA_MODULE(bld, modname, source, source = bld.EXPAND_VARIABLES(source, vars=vars) - obj_target = modname + '.objlist' + if internal_module or BUILTIN_LIBRARY(bld, modname): + # treat internal modules as subsystems for now + if subsystem is not None: + deps += ' ' + subsystem - bld.SAMBA_SUBSYSTEM(obj_target, source, + bld.SAMBA_SUBSYSTEM(modname, source, deps=deps, includes=includes, autoproto=autoproto, @@ -341,10 +344,6 @@ def SAMBA_MODULE(bld, modname, source, local_include=local_include, enabled=enabled) - if internal_module or BUILTIN_LIBRARY(bld, modname): - # treat internal modules as subsystems for now - bld.SAMBA_SUBSYSTEM(modname, deps=obj_target, source=[], - enabled=enabled) bld.ADD_INIT_FUNCTION(subsystem, modname, init_function) return @@ -355,6 +354,17 @@ def SAMBA_MODULE(bld, modname, source, if not SET_TARGET_TYPE(bld, modname, 'MODULE'): return + obj_target = modname + '.objlist' + + obj_target = bld.SAMBA_SUBSYSTEM(obj_target, source, + deps=deps, + includes=includes, + autoproto=autoproto, + autoproto_extra_source=autoproto_extra_source, + cflags=cflags, + local_include=local_include, + enabled=enabled) + deps = TO_LIST(deps) deps.append(obj_target) realname = modname |