summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-10-21 15:30:27 +1100
committerAndrew Tridgell <tridge@samba.org>2010-10-21 19:03:26 +1100
commit51dc322f6314cd94eb2bfc72d2c83fb8a55a1134 (patch)
tree2474d154605d753dcf2e4f0146403cde5971a665
parentcef53b289b28e208602e34cfe8c93e05102bdc29 (diff)
downloadsamba-51dc322f6314cd94eb2bfc72d2c83fb8a55a1134.tar.gz
samba-51dc322f6314cd94eb2bfc72d2c83fb8a55a1134.tar.bz2
samba-51dc322f6314cd94eb2bfc72d2c83fb8a55a1134.zip
waf: show duplicate objects in python modules as well as libraries
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--buildtools/wafsamba/samba_deps.py5
1 files changed, 3 insertions, 2 deletions
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)