waf: show duplicate objects in python modules as well as libraries
authorAndrew Tridgell <tridge@samba.org>
Thu, 21 Oct 2010 04:30:27 +0000 (15:30 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 21 Oct 2010 08:03:26 +0000 (19:03 +1100)
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

buildtools/wafsamba/samba_deps.py

index 491a48bad8678e4814a6541c6084054fd516c4a4..6ca5b5e5ef1ac91a2c4171dc7de29189b1a04b0d 100644 (file)
@@ -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)