Error in Makefile

diff --git a/src/WOKLibs/Makefile.am b/src/WOKLibs/Makefile.am
index 29577402b98fef5b7687884f5fd831a336bb7b07..8a730db215f2a0d9ecfaee5fa83c9cd1391fabb9 100755 (executable)
--- a/src/WOKLibs/Makefile.am
+++ b/src/WOKLibs/Makefile.am
@@ -13,23 +13,23 @@ libwokdfltsteps.la libwokobjssteps.la libwokorbixsteps.la \
 libwoksteps.la libwoktoolscmd.la libwokutilscmd.la \
 libmscmd.la
 
-libwokdeliverysteps_la_LIBADD =../TKWOK/libTKWOK.la $(CSF_TclTkLibs_LIB) 
+libwokdeliverysteps_la_LIBADD =../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
-libwokcmd_la_LIBADD =../TKWOK/libTKWOK.la $(CSF_TclTkLibs_LIB) 
+libwokcmd_la_LIBADD =../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
-libwokdfltsteps_la_LIBADD =../TKWOK/libTKWOK.la $(CSF_TclTkLibs_LIB) 
+libwokdfltsteps_la_LIBADD =../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
-libwokobjssteps_la_LIBADD =../TKWOK/libTKWOK.la $(CSF_TclTkLibs_LIB) 
+libwokobjssteps_la_LIBADD =../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
-libwokorbixsteps_la_LIBADD =../TKWOK/libTKWOK.la ${CSF_TclTkLibs_LIB)
+libwokorbixsteps_la_LIBADD =../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
-libwoksteps_la_LIBADD =../TKWOK/libTKWOK.la  ${CSF_TclTkLibs_LIB)
+libwoksteps_la_LIBADD =../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
-libwoktoolscmd_la_LIBADD =../TKWOK/libTKWOK.la ${CSF_TclTkLibs_LIB)
+libwoktoolscmd_la_LIBADD =../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
-libwokutilscmd_la_LIBADD =../TKWOK/libTKWOK.la ${CSF_TclTkLibs_LIB)
+libwokutilscmd_la_LIBADD =../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
-libmscmd_la_LIBADD =../TKWOK/libTKWOK.la ${CSF_TclTkLibs_LIB)
+libmscmd_la_LIBADD =../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
 libwokdeliverysteps_la_SOURCES = wokdeliverysteps.cxx
 libwokcmd_la_SOURCES = wokcmd.cxx

diff --git a/src/WOKLibs/Makefile.in b/src/WOKLibs/Makefile.in
index 7ceed923fdd992e5d914029eb59a3b636df37141..49c3cc13b087126af0942e3f96325c135471f2fb 100755 (executable)
--- a/src/WOKLibs/Makefile.in
+++ b/src/WOKLibs/Makefile.in
@@ -69,8 +69,8 @@ CSF_FPELibs_LIB = @CSF_FPELibs_LIB@
 CSF_OpenGlLibs_INCLUDE = @CSF_OpenGlLibs_INCLUDE@
 CSF_OpenGlLibs_LIB = @CSF_OpenGlLibs_LIB@
 CSF_SOCKETLibs_LIB = @CSF_SOCKETLibs_LIB@
-CSF_TclTkLibs_INCLUDES = @CSF_TclTkLibs_INCLUDES@
-CSF_TclTkLibs_LIB = @CSF_TclTkLibs_LIB@
+CSF_TclLibs_INCLUDES = @CSF_TclLibs_INCLUDES@
+CSF_TclLibs_LIB = @CSF_TclLibs_LIB@
 CSF_TclTkLibs_INCLUDES = @CSF_TclTkLibs_INCLUDES@
 CSF_TclTkLibs_LIB = @CSF_TclTkLibs_LIB@
 CSF_XwLibs_LIB = @CSF_XwLibs_LIB@
@@ -117,23 +117,23 @@ INCLUDES = $(CSF_SOCKETLibs_INCLUDES) $(CSF_FPELibs_INCLUDES) $(CSF_advapi32_INC
 lib_LTLIBRARIES = libwokcmd.la libwokdeliverysteps.la libwokdfltsteps.la libwokobjssteps.la libwokorbixsteps.la libwoksteps.la libwoktoolscmd.la libwokutilscmd.la libmscmd.la
 
 
-libwokdeliverysteps_la_LIBADD = ../TKWOK/libTKWOK.la $(CSF_TclTkLibs_LIB) 
+libwokdeliverysteps_la_LIBADD = ../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
-libwokcmd_la_LIBADD = ../TKWOK/libTKWOK.la $(CSF_TclTkLibs_LIB) 
+libwokcmd_la_LIBADD = ../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
-libwokdfltsteps_la_LIBADD = ../TKWOK/libTKWOK.la $(CSF_TclTkLibs_LIB) 
+libwokdfltsteps_la_LIBADD = ../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
-libwokobjssteps_la_LIBADD = ../TKWOK/libTKWOK.la $(CSF_TclTkLibs_LIB) 
+libwokobjssteps_la_LIBADD = ../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
-libwokorbixsteps_la_LIBADD = ../TKWOK/libTKWOK.la $(CSF_TclTkLibs_LIB)
+libwokorbixsteps_la_LIBADD = ../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
-libwoksteps_la_LIBADD = ../TKWOK/libTKWOK.la  $(CSF_TclTkLibs_LIB)
+libwoksteps_la_LIBADD = ../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
-libwoktoolscmd_la_LIBADD = ../TKWOK/libTKWOK.la $(CSF_TclTkLibs_LIB)
+libwoktoolscmd_la_LIBADD = ../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
-libwokutilscmd_la_LIBADD = ../TKWOK/libTKWOK.la $(CSF_TclTkLibs_LIB)
+libwokutilscmd_la_LIBADD = ../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
-libmscmd_la_LIBADD = ../TKWOK/libTKWOK.la $(CSF_TclTkLibs_LIB)
+libmscmd_la_LIBADD = ../TKWOK/libTKWOK.la ../TKWOKTcl/libTKWOKTcl.la $(CSF_TclTkLibs_LIB) 
 
 libwokdeliverysteps_la_SOURCES = wokdeliverysteps.cxx
 libwokcmd_la_SOURCES = wokcmd.cxx
@@ -153,34 +153,40 @@ LTLIBRARIES =  $(lib_LTLIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) -I../..
 CPPFLAGS = @CPPFLAGS@
 libwokcmd_la_LDFLAGS = 
-libwokcmd_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la
+libwokcmd_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la \
+../TKWOKTcl/libTKWOKTcl.la
 libwokcmd_la_OBJECTS =  wokcmd.lo
 libwokdeliverysteps_la_LDFLAGS = 
-libwokdeliverysteps_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la
+libwokdeliverysteps_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la \
+../TKWOKTcl/libTKWOKTcl.la
 libwokdeliverysteps_la_OBJECTS =  wokdeliverysteps.lo
 libwokdfltsteps_la_LDFLAGS = 
-libwokdfltsteps_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la
+libwokdfltsteps_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la \
+../TKWOKTcl/libTKWOKTcl.la
 libwokdfltsteps_la_OBJECTS =  wokdfltsteps.lo
 libwokobjssteps_la_LDFLAGS = 
-libwokobjssteps_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la
+libwokobjssteps_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la \
+../TKWOKTcl/libTKWOKTcl.la
 libwokobjssteps_la_OBJECTS =  wokobjssteps.lo
 libwokorbixsteps_la_LDFLAGS = 
 libwokorbixsteps_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la \
-$(CSF_TclTkLibs_LIB)
+../TKWOKTcl/libTKWOKTcl.la
 libwokorbixsteps_la_OBJECTS =  wokorbixsteps.lo
 libwoksteps_la_LDFLAGS = 
-libwoksteps_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la $(CSF_TclTkLibs_LIB)
+libwoksteps_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la \
+../TKWOKTcl/libTKWOKTcl.la
 libwoksteps_la_OBJECTS =  woksteps.lo
 libwoktoolscmd_la_LDFLAGS = 
 libwoktoolscmd_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la \
-$(CSF_TclTkLibs_LIB)
+../TKWOKTcl/libTKWOKTcl.la
 libwoktoolscmd_la_OBJECTS =  woktoolscmd.lo
 libwokutilscmd_la_LDFLAGS = 
 libwokutilscmd_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la \
-$(CSF_TclTkLibs_LIB)
+../TKWOKTcl/libTKWOKTcl.la
 libwokutilscmd_la_OBJECTS =  wokutilscmd.lo
 libmscmd_la_LDFLAGS = 
-libmscmd_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la $(CSF_TclTkLibs_LIB)
+libmscmd_la_DEPENDENCIES =  ../TKWOK/libTKWOK.la \
+../TKWOKTcl/libTKWOKTcl.la
 libmscmd_la_OBJECTS =  mscmd.lo
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)