From cea4bab1e44789d1caa0e2edecd71b5bfcdac1df Mon Sep 17 00:00:00 2001 From: dgp Date: Wed, 2 Apr 2008 04:25:13 +0000 Subject: * generic/tclBasic.c: Revised stubs-generation tool and interp * tools/genStubs.tcl: creation so that "tclStubsPtr" is not present * unix/Makefile.in: in libtcl.so, but is present only in * win/Makefile.in: libtclstub.a. This tightens up the rules for users of the stubs interfaces. [Bug 1819422] --- ChangeLog | 4 ++-- win/Makefile.in | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1587082..80c04c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,8 +31,8 @@ * generic/tclBasic.c: Revised stubs-generation tool and interp * tools/genStubs.tcl: creation so that "tclStubsPtr" is not present * unix/Makefile.in: in libtcl.so, but is present only in - libtclstub.a. This tightens up the rules for users of the stubs - interfaces. [Bug 1819422] + * win/Makefile.in: libtclstub.a. This tightens up the rules for + users of the stubs interfaces. [Bug 1819422] * generic/tclDecls.h: make genstubs * generic/tclIntDecls.h: diff --git a/win/Makefile.in b/win/Makefile.in index f453595..7d71edf 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.124 2008/03/12 09:51:39 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.125 2008/04/02 04:25:14 dgp Exp $ VERSION = @TCL_VERSION@ @@ -267,7 +267,6 @@ GENERIC_OBJS = \ tclStringObj.$(OBJEXT) \ tclStrToD.$(OBJEXT) \ tclStubInit.$(OBJEXT) \ - tclStubLib.$(OBJEXT) \ tclThread.$(OBJEXT) \ tclThreadAlloc.$(OBJEXT) \ tclThreadJoin.$(OBJEXT) \ @@ -391,7 +390,7 @@ winhelp: $(ROOT_DIR)/tools/man2help.tcl $(MAN2TCL) $(MAN2TCL): $(ROOT_DIR)/tools/man2tcl.c $(CC) $(CFLAGS_OPTIMIZE) $(MAN2TCLFLAGS) -o $(MAN2TCL) "$(ROOT_DIR_NATIVE)"/tools/man2tcl.c -$(TCLSH): $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(TCLSH_OBJS) tclsh.$(RES) +$(TCLSH): $(TCL_LIB_FILE) $(TCLSH_OBJS) tclsh.$(RES) $(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(LIBS) \ tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE) -- cgit v0.12