git.samba.org
/
abartlet
/
samba.git
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
waf: show duplicate objects in python modules as well as libraries
[abartlet/samba.git/.git]
/
buildtools
/
wafsamba
/
samba_deps.py
diff --git
a/buildtools/wafsamba/samba_deps.py
b/buildtools/wafsamba/samba_deps.py
index 491a48bad8678e4814a6541c6084054fd516c4a4..6ca5b5e5ef1ac91a2c4171dc7de29189b1a04b0d 100644
(file)
--- 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:
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)
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)
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())
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)
if Options.options.SHOW_DUPLICATES:
show_object_duplicates(bld, tgt_list)