Put ttkStubLib.o in libtkstub instead of libtk. [Bug 1863007].

4 files changed, 16 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 31f5a3f..c091308 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-17  Joe English  <jenglish@users.sourceforge.net>
+
+	* unix/Makefile.in, win/Makefile.in, win/makefile.vc:
+	Put ttkStubLib.o in libtkstub instead of libtk. 
+	[Bug 1863007].
+
 2008-03-16  Donal K. Fellows  <dkf@users.sf.net>
 
 	* library/demos/goldberg.tcl: Made work when run twice in the same
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 3e07a21..608401b 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.140 2008/03/12 16:17:17 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.141 2008/03/18 06:59:04 jenglish Exp $
 
 # Current Tk version;  used in various names.
 
@@ -370,13 +370,11 @@ TTK_OBJS = \
 	ttkPanedwindow.o ttkProgress.o ttkScale.o ttkScrollbar.o ttkScroll.o \
 	ttkSeparator.o ttkSquare.o ttkState.o \
 	ttkTagSet.o ttkTheme.o ttkTrace.o ttkTrack.o ttkTreeview.o \
-	ttkWidget.o
-
-TTK_STUB_OBJS =  ttkStubInit.o ttkStubLib.o
+	ttkWidget.o ttkStubInit.o
 
 STUB_OBJS = tkStubInit.o tkStubLib.o
 
-STUB_LIB_OBJS = tkStubLib.o
+STUB_LIB_OBJS = tkStubLib.o ttkStubLib.o
 
 X11_OBJS = tkUnix.o tkUnix3d.o tkUnixButton.o tkUnixColor.o tkUnixConfig.o \
 	tkUnixCursor.o tkUnixDraw.o tkUnixEmbed.o tkUnixEvent.o \
@@ -400,7 +398,7 @@ AQUA_OBJS = tkMacOSXBitmap.o tkMacOSXButton.o tkMacOSXClipboard.o \
 AQUA_TKTEST_OBJS = tkMacOSXTest.o
 
 OBJS =  $(GENERIC_OBJS) $(WIDG_OBJS) $(CANV_OBJS) $(IMAGE_OBJS) $(TEXT_OBJS) \
-	$(STUB_OBJS) $(TTK_OBJS) $(TTK_STUB_OBJS) \
+	$(STUB_OBJS) $(TTK_OBJS) \
 	$(@TK_WINDOWINGSYSTEM@_OBJS) @PLAT_OBJS@
 
 TK_DECLS = \
diff --git a/win/Makefile.in b/win/Makefile.in
index 61b577c..42c1312 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.77 2007/12/13 15:28:52 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.78 2008/03/18 06:59:04 jenglish Exp $
 
 TCLVERSION		= @TCL_VERSION@
 TCLPATCHL		= @TCL_PATCH_LEVEL@
@@ -385,11 +385,10 @@ TTK_OBJS = \
 	ttkTrack.$(OBJEXT) \
 	ttkTreeview.$(OBJEXT) \
 	ttkWidget.$(OBJEXT) \
-	ttkStubInit.$(OBJEXT) \
-	ttkStubLib.$(OBJEXT)
+	ttkStubInit.$(OBJEXT)
 
 STUB_OBJS = \
-	tkStubLib.$(OBJEXT)
+	tkStubLib.$(OBJEXT) ttkStubLib.$(OBJEXT)
 
 TCL_DOCS = "$(TCL_SRC_DIR_NATIVE)"/doc/*.[13n]
 TK_DOCS = "$(ROOT_DIR_NATIVE)"/doc/*.[13n]
diff --git a/win/makefile.vc b/win/makefile.vc
index 70d0b6d..9690013 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
 # Copyright (c) 2001-2004 David Gravereaux.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.116 2007/12/14 02:19:42 patthoyts Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.117 2008/03/18 06:59:04 jenglish Exp $
 #------------------------------------------------------------------------------
 
 # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -393,11 +393,10 @@ TTK_OBJS = \
         $(TMP_DIR)\ttkTrack.obj \
         $(TMP_DIR)\ttkTreeview.obj \
         $(TMP_DIR)\ttkWidget.obj \
-        $(TMP_DIR)\ttkStubInit.obj \
-        $(TMP_DIR)\ttkStubLib.obj
+        $(TMP_DIR)\ttkStubInit.obj
 
 TKSTUBOBJS = \
-	$(TMP_DIR)\tkStubLib.obj
+	$(TMP_DIR)\tkStubLib.obj $(TMP_DIR)\ttkStubLib.obj
 
 
 WINDIR          = $(ROOT)\win