diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-30 20:21:21 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:18 +1000 |
| commit | b498378c8fcb2f87f7cb296e4e81ac392b1e34ff (patch) | |
| tree | d8ac3fdd2142bebf9fc8a29f0581fe564227aebf /buildtools/wafsamba/wafsamba.py | |
| parent | 20a8574717aef8f946ac9d8f3284e7318eeb9bf8 (diff) | |
| download | samba-b498378c8fcb2f87f7cb296e4e81ac392b1e34ff.tar.gz samba-b498378c8fcb2f87f7cb296e4e81ac392b1e34ff.tar.bz2 samba-b498378c8fcb2f87f7cb296e4e81ac392b1e34ff.zip | |
s4-waf: fixed some of the group ordering
We need to try to keep targets in the right groups
Diffstat (limited to 'buildtools/wafsamba/wafsamba.py')
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 2f3120d6e9..3f48de4ca6 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -252,8 +252,6 @@ def SAMBA_BINARY(bld, binname, source, if needs_python: features += ' pyembed' - bld.SET_BUILD_GROUP(group) - obj_target = binname + '.objlist' source = bld.EXPAND_VARIABLES(source, vars=vars) @@ -272,6 +270,8 @@ def SAMBA_BINARY(bld, binname, source, needs_python = needs_python, local_include = local_include) + bld.SET_BUILD_GROUP(group) + # the library itself will depend on that object target deps = TO_LIST(deps) deps.append(obj_target) @@ -484,7 +484,7 @@ Build.BuildContext.SAMBA_SUBSYSTEM = SAMBA_SUBSYSTEM def SAMBA_GENERATOR(bld, name, rule, source, target, - group='build_source', enabled=True, + group='generators', enabled=True, public_headers=None, header_path=None, vars=None): @@ -535,6 +535,9 @@ def SETUP_BUILD_GROUPS(bld): bld.add_group('setup') bld.add_group('build_compiler_source') bld.add_group('base_libraries') + bld.add_group('generators') + bld.add_group('compiler_prototypes') + bld.add_group('compiler_libraries') bld.add_group('build_compilers') bld.add_group('build_source') bld.add_group('prototypes') |