No comments

diff --git a/src/TKWOKTcl/EXTERNLIB b/src/TKWOKTcl/EXTERNLIB
index 5c380267a763ebbea99b58c327af954802300cf1..34dc7faea3a907e11f5287a3edad0733a8f47881 100755 (executable)
--- a/src/TKWOKTcl/EXTERNLIB
+++ b/src/TKWOKTcl/EXTERNLIB
@@ -1 +1,3 @@
 TKWOK
+CSF_TclLibs
+CSF_TclTkLibs

diff --git a/src/TKWOKTcl/Makefile.am b/src/TKWOKTcl/Makefile.am
index 817629c4c967feec5b4af55462028bb01e087756..a7d3409edd1fab97def01f95ed4bad011e73932d 100755 (executable)
--- a/src/TKWOKTcl/Makefile.am
+++ b/src/TKWOKTcl/Makefile.am
@@ -8,7 +8,7 @@ VPATH = @srcdir@ : \
 @top_srcdir@/drv/WOKTCL : @top_srcdir@/src/WOKTCL
 
 
-INCLUDES =  \
+INCLUDES = $(CSF_TclLibs_INCLUDES) $(CSF_TclTkLibs_INCLUDES) \
 -I@top_srcdir@/inc \
 -I@top_srcdir@/drv/WOKTclUtils \
 -I@top_srcdir@/drv/WOKTclTools \
@@ -20,8 +20,8 @@ lib_LTLIBRARIES=libTKWOKTcl.la
 
 libTKWOKTcl_la_LIBADD = \
 ../TKWOK/libTKWOK.la \
-../TKernel/libTKernel.la
-
+../TKernel/libTKernel.la \
+$(CSF_TclLibs_LIB) $(CSF_TclTkLibs_LIB) 
 
 libTKWOKTcl_la_SOURCES = \
 MSAPI_Class.cxx \

diff --git a/src/TKWOKTcl/Makefile.in b/src/TKWOKTcl/Makefile.in
index 4f7c03d2be40f6e51e29612555efafe8248f28d7..43bc41892e504312f1bb81de26d6d7cf46e450bb 100755 (executable)
--- a/src/TKWOKTcl/Makefile.in
+++ b/src/TKWOKTcl/Makefile.in
@@ -118,12 +118,12 @@ srcdir = @srcdir@
 VPATH = @srcdir@ : @top_srcdir@/drv/WOKTclUtils : @top_srcdir@/src/WOKTclUtils: @top_srcdir@/drv/WOKTclTools : @top_srcdir@/src/WOKTclTools: @top_srcdir@/drv/MSAPI : @top_srcdir@/src/MSAPI: @top_srcdir@/drv/WOKTCL : @top_srcdir@/src/WOKTCL
 
 
-INCLUDES =  -I@top_srcdir@/inc -I@top_srcdir@/drv/WOKTclUtils -I@top_srcdir@/drv/WOKTclTools -I@top_srcdir@/drv/MSAPI -I@top_srcdir@/drv/WOKTCL
+INCLUDES =  $(CSF_TclLibs_INCLUDES) $(CSF_TclTkLibs_INCLUDES) -I@top_srcdir@/inc -I@top_srcdir@/drv/WOKTclUtils -I@top_srcdir@/drv/WOKTclTools -I@top_srcdir@/drv/MSAPI -I@top_srcdir@/drv/WOKTCL
 
 
 lib_LTLIBRARIES = libTKWOKTcl.la
 
-libTKWOKTcl_la_LIBADD =  ../TKWOK/libTKWOK.la ../TKernel/libTKernel.la
+libTKWOKTcl_la_LIBADD =  ../TKWOK/libTKWOK.la ../TKernel/libTKernel.la $(CSF_TclLibs_LIB) $(CSF_TclTkLibs_LIB) 
 
 
 libTKWOKTcl_la_SOURCES =  MSAPI_Class.cxx MSAPI_ExternMet.cxx MSAPI_GenClass.cxx MSAPI_InstClass.cxx MSAPI_MemberMet.cxx MSAPI_MetaSchema.cxx MSAPI_Method.cxx MSAPI_Package.cxx MSAPI_Schema.cxx MSAPI_StdClass.cxx WOKTCL_DefaultCommand.cxx WOKTCL_Interpretor.cxx WOKTCL_TriggerHandler.cxx WOKTclTools_Interpretor.cxx WOKTclTools_Messages.cxx WOKTclTools_MsgAPI.cxx WOKTclTools_Package.cxx WOKTclTools_TriggerHandler.cxx WOKTclUtils_Path.cxx