From 51dc322f6314cd94eb2bfc72d2c83fb8a55a1134 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 21 Oct 2010 15:30:27 +1100 Subject: waf: show duplicate objects in python modules as well as libraries Pair-Programmed-With: Andrew Bartlett --- buildtools/wafsamba/samba_deps.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'buildtools') diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index 491a48bad8..6ca5b5e5ef 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -883,7 +883,7 @@ def show_object_duplicates(bld, tgt_list): Logs.info("showing duplicate objects") for t in tgt_list: - if not targets[t.sname] in [ 'LIBRARY' ]: + if not targets[t.sname] in [ 'LIBRARY', 'PYTHON' ]: continue for n in getattr(t, 'final_objects', set()): t2 = bld.name_to_obj(n, bld.env) @@ -1073,11 +1073,12 @@ def check_project_rules(bld): build_direct_deps(bld, tgt_list) break_dependency_loops(bld, tgt_list) - calculate_final_deps(bld, tgt_list, loops) if Options.options.SHOWDEPS: show_dependencies(bld, Options.options.SHOWDEPS, set()) + calculate_final_deps(bld, tgt_list, loops) + if Options.options.SHOW_DUPLICATES: show_object_duplicates(bld, tgt_list) -- cgit