From: ibs <ibs@opencascade.com>
Date: Thu, 18 Apr 2013 14:04:13 +0000 (+0400)
Subject: 0023887: wgenproj -target=amk generate incorrect dependicies in *.am files for occt... 
X-Git-Tag: V6_7_1~47
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=ac4f039e77f4f5da3e583a95df3a7783a3da2c60;p=occt-wok.git

0023887: wgenproj -target=amk generate incorrect dependicies in *.am files for occt products

if automake files generates for OCCT, toolkits will include to libTKDXF_la_LIBADD variable like ../<toolkit name>/lib<toolkit name>.so
0023887: wgenproj -target=amk generate incorrect dependicies in *.am files for occt products

paths to father libs added;
all father libs have prefix -l now
---

diff --git a/src/WOKTclLib/osutils.tcl b/src/WOKTclLib/osutils.tcl
index 00ca949..e716fc2 100755
--- a/src/WOKTclLib/osutils.tcl
+++ b/src/WOKTclLib/osutils.tcl
@@ -1576,24 +1576,18 @@ proc osutils:am:__INCLUDES__ { l } {
 ;#
 proc osutils:am:__LIBADD__ { theIncToolkits {final 0} } {
 
+  set aFatherModules ""
   set aCurrentWorkBench [wokinfo -w]
-  set aFirstFatherWorkBench $aCurrentWorkBench
-  
   while { "[w_info -f]" != "" } {
     wokcd [w_info -f]
-    set aFirstFatherWorkBench [wokinfo -w]
+    append aFatherModules [w_info -k]
   }
+  wokcd $aCurrentWorkBench
   
-  set aOriginModules {}
-  if { "$aCurrentWorkBench" != "$aFirstFatherWorkBench" } {
-    set aOriginModules [w_info -k]
-    wokcd $aCurrentWorkBench
-  }
-
   set aLibString ""
   
   foreach aIncToolkit $theIncToolkits {
-    if { [lsearch $aOriginModules $aIncToolkit] != -1} {
+    if { [lsearch [split $aFatherModules " "] $aIncToolkit] != -1} {
       append aLibString " \\\n-l$aIncToolkit"
     } else {
       append aLibString " \\\n../$aIncToolkit/lib$aIncToolkit.la"