summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-30 11:19:08 +1100
committerAndrew Tridgell <tridge@samba.org>2010-10-30 23:49:00 +1100
commitae0f420dd989b165876b4b07754043a01604583e (patch)
tree77d102efd687a3f1c54f88a9fb282c6af910f32c
parentadabc3d082a2e23a9bca9282ad5e7be07fa776e9 (diff)
downloadsamba-ae0f420dd989b165876b4b07754043a01604583e.tar.gz
samba-ae0f420dd989b165876b4b07754043a01604583e.tar.bz2
samba-ae0f420dd989b165876b4b07754043a01604583e.zip
waf: don't auto-depend on subsystems
this is part of an effort to reduce the amount of automatic dependency munging we do. When working on the correct dependency tree for Samba it is easier to add the right dependencies in the wscript files than rely on them being added by the waf rules. This change removes the automatic dependency of modules on their subsystem. Many modules don't actually need this dependency anyway, so it is better to add it where they are needed (for example, for ldb modules) Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--buildtools/wafsamba/samba_deps.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index 3bcf8fd92e..56af446df3 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -83,13 +83,6 @@ def expand_subsystem_deps(bld):
# subsystem it is part of needs to have it as a dependency, so targets
# that depend on this subsystem get the modules of that subsystem
subsystem.samba_deps_extended.append(module_name)
- module = bld.name_to_obj(module_name, bld.env)
- bld.ASSERT(module is not None, "Unable to find module %s in subsystem %s" % (module_name, subsystem_name))
- module.samba_includes_extended.extend(subsystem.samba_includes_extended)
- if targets[subsystem_name] in ['SUBSYSTEM']:
- # if a subsystem is a plain object type (not a library) then any modules
- # in that subsystem need to depend on the subsystem
- module.samba_deps_extended.extend(subsystem.samba_deps_extended)
subsystem.samba_deps_extended = unique_list(subsystem.samba_deps_extended)