From 3049ef70d8cbcbb5385fd71872c3b74dd3808680 Mon Sep 17 00:00:00 2001 From: dgp Date: Wed, 2 Apr 2008 04:30:40 +0000 Subject: * generic/tkWindow.c: Revised package initialization so that * unix/Makefile.in: "tkStubsPtr" is not present in libtk.so, but * win/Makefile.in: is present only in libtkstub.a. This tightens * win/makefile.bc: up the rules for users of the stubs interfaces. * win/makefile.vc: [Tcl Bug 1819422]. --- ChangeLog | 5 +++-- win/Makefile.in | 3 +-- win/makefile.bc | 3 +-- win/makefile.vc | 3 +-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1899931..e513ce0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,8 +6,9 @@ * generic/tkWindow.c: Revised package initialization so that * unix/Makefile.in: "tkStubsPtr" is not present in libtk.so, but - is present only in libtkstub.a. This tightens up the rules for users - of the stubs interfaces. [Tcl Bug 1819422]. + * win/Makefile.in: is present only in libtkstub.a. This tightens + * win/makefile.bc: up the rules for users of the stubs interfaces. + * win/makefile.vc: [Tcl Bug 1819422]. * README: Bump version number to 8.6a0 * generic/tk.h: diff --git a/win/Makefile.in b/win/Makefile.in index 42c1312..96343c3 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.78 2008/03/18 06:59:04 jenglish Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.79 2008/04/02 04:30:42 dgp Exp $ TCLVERSION = @TCL_VERSION@ TCLPATCHL = @TCL_PATCH_LEVEL@ @@ -348,7 +348,6 @@ TK_OBJS = \ tkUtil.$(OBJEXT) \ tkVisual.$(OBJEXT) \ tkStubInit.$(OBJEXT) \ - tkStubLib.$(OBJEXT) \ tkWindow.$(OBJEXT) \ $(TTK_OBJS) diff --git a/win/makefile.bc b/win/makefile.bc index 2454156..3575582 100644 --- a/win/makefile.bc +++ b/win/makefile.bc @@ -13,7 +13,7 @@ # Copyright (c) 1995-1997 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Ajuba Solutions. # -# RCS: @(#) $Id: makefile.bc,v 1.14 2007/05/14 20:58:31 dgp Exp $ +# RCS: @(#) $Id: makefile.bc,v 1.15 2008/04/02 04:30:44 dgp Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -227,7 +227,6 @@ TKOBJS = \ $(TMPDIR)\tkUtil.obj \ $(TMPDIR)\tkVisual.obj \ $(TMPDIR)\tkStubInit.obj \ - $(TMPDIR)\tkStubLib.obj \ $(TMPDIR)\tkWindow.obj # Maintenance hint: Please have multiple members of TKSTUBOBJS be separated diff --git a/win/makefile.vc b/win/makefile.vc index 9690013..f85bd02 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.117 2008/03/18 06:59:04 jenglish Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.118 2008/04/02 04:30:44 dgp Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -353,7 +353,6 @@ TKOBJS = \ $(TMP_DIR)\tkUtil.obj \ $(TMP_DIR)\tkVisual.obj \ $(TMP_DIR)\tkStubInit.obj \ - $(TMP_DIR)\tkStubLib.obj \ $(TMP_DIR)\tkWindow.obj \ $(TTK_OBJS) \ !if !$(STATIC_BUILD) -- cgit v0.12