diff options
| author | jenglish <jenglish@flightlab.com> | 2008-03-18 06:59:02 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2008-03-18 06:59:02 (GMT) |
| commit | 90ce810746fbaa08d5fa7099a347066d737c9275 (patch) | |
| tree | f6c22d09fe91e397ceeab0a725bba7be955b1743 /win | |
| parent | 0c94e168db4406390a2cc05da64a0751cbf9ae7f (diff) | |
| download | tk-90ce810746fbaa08d5fa7099a347066d737c9275.zip tk-90ce810746fbaa08d5fa7099a347066d737c9275.tar.gz tk-90ce810746fbaa08d5fa7099a347066d737c9275.tar.bz2 | |
Put ttkStubLib.o in libtkstub instead of libtk. [Bug 1863007].
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 7 | ||||
| -rw-r--r-- | win/makefile.vc | 7 |
2 files changed, 6 insertions, 8 deletions
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 |