From a7373766cb2af2486ba8c56bcc0b0425678269d4 Mon Sep 17 00:00:00 2001 From: ibs Date: Thu, 11 Apr 2013 12:53:20 +0400 Subject: [PATCH] * 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 ..//lib.so --- src/WOKTclLib/osutils.tcl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/WOKTclLib/osutils.tcl b/src/WOKTclLib/osutils.tcl index 346c65b..7cca4a8 100755 --- a/src/WOKTclLib/osutils.tcl +++ b/src/WOKTclLib/osutils.tcl @@ -1577,11 +1577,18 @@ proc osutils:am:__INCLUDES__ { l } { proc osutils:am:__LIBADD__ { theIncToolkits {final 0} } { set aCurrentWorkBench [wokinfo -w] + set aFirstFatherWorkBench $aCurrentWorkBench + while { "[w_info -f]" != "" } { wokcd [w_info -f] + set aFirstFatherWorkBench [wokinfo -w] + } + + set aOriginModules {} + if { "$aCurrentWorkBench" != "$aFirstFatherWorkBench" } { + set aOriginModules [w_info -k] + wokcd $aCurrentWorkBench } - set aOriginModules [w_info -k] - wokcd $aCurrentWorkBench set aLibString "" -- 2.39.5