summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2005-12-01 02:03:58 (GMT)
committerhobbs <hobbs>2005-12-01 02:03:58 (GMT)
commitbbec06f6a653b6b2231ddd6f90ee9dabd39c0c76 (patch)
tree98fddf0b6fba2e3e04feabb10bf192e9586a86f5
parent90106fede7439d25db345f35e1f02035a80a8326 (diff)
downloadtk-bbec06f6a653b6b2231ddd6f90ee9dabd39c0c76.zip
tk-bbec06f6a653b6b2231ddd6f90ee9dabd39c0c76.tar.gz
tk-bbec06f6a653b6b2231ddd6f90ee9dabd39c0c76.tar.bz2
* win/Makefile.in: place TCL_BIN_DIR first in PATH for targets to
get Tcl built dll first.
-rw-r--r--ChangeLog7
-rw-r--r--win/Makefile.in17
2 files changed, 14 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 92d220a..84a8376 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-30 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * win/Makefile.in: place TCL_BIN_DIR first in PATH for targets to
+ get Tcl built dll first.
+
+ * tests/scrollbar.test (6.22): fix rounding-error sensitive test
+
2005-11-29 Jeff Hobbs <jeffh@ActiveState.com>
* library/console.tcl (::tk::ConsoleInit): improve work-around to
diff --git a/win/Makefile.in b/win/Makefile.in
index 5986853..a2e6c3b 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.63 2005/08/23 18:25:34 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.64 2005/12/01 02:03:58 hobbs Exp $
TCLVERSION = @TCL_VERSION@
VERSION = @TK_VERSION@
@@ -233,8 +233,7 @@ WISH_OBJS = \
TKTEST_OBJS = \
testMain.$(OBJEXT) \
tkSquare.$(OBJEXT) \
- tkTest.$(OBJEXT) \
- tkWinTest.$(OBJEXT)
+ tkTest.$(OBJEXT)
XLIB_OBJS = \
xcolors.$(OBJEXT) \
@@ -269,6 +268,7 @@ TK_OBJS = \
tkWinScrlbr.$(OBJEXT) \
tkWinSend.$(OBJEXT) \
tkWinSendCom.$(OBJEXT) \
+ tkWinTest.$(OBJEXT) \
tkWinWindow.$(OBJEXT) \
tkWinWm.$(OBJEXT) \
tkWinX.$(OBJEXT) \
@@ -387,14 +387,14 @@ $(MAN2TCL): $(TCL_SRC_DIR_NATIVE)/tools/man2tcl.c
test: binaries $(TKTEST)
@TCL_LIBRARY="$(TCL_SRC_DIR_NATIVE)/library"; export TCL_LIBRARY; \
TK_LIBRARY="$(ROOT_DIR_NATIVE)/library"; export TK_LIBRARY; \
- PATH="$(PATH):$(TCL_BIN_DIR)"; export PATH; \
+ PATH="$(TCL_BIN_DIR):$(PATH)"; export PATH; \
./$(TKTEST) "$(ROOT_DIR_NATIVE)/tests/all.tcl" $(TESTFLAGS) \
| ./$(CAT32)
runtest: binaries $(TKTEST)
@TCL_LIBRARY="$(TCL_SRC_DIR_NATIVE)/library"; export TCL_LIBRARY; \
TK_LIBRARY="$(ROOT_DIR_NATIVE)/library"; export TK_LIBRARY; \
- PATH="$(PATH):$(TCL_BIN_DIR)"; export PATH; \
+ PATH="$(TCL_BIN_DIR):$(PATH)"; export PATH; \
./$(TKTEST) $(TESTFLAGS) $(SCRIPT)
# This target can be used to run wish from the build directory
@@ -402,14 +402,14 @@ runtest: binaries $(TKTEST)
shell: binaries
@TCL_LIBRARY="$(TCL_SRC_DIR_NATIVE)/library"; export TCL_LIBRARY; \
TK_LIBRARY="$(ROOT_DIR_NATIVE)/library"; export TK_LIBRARY; \
- PATH="$(PATH):$(TCL_BIN_DIR)"; export PATH; \
+ PATH="$(TCL_BIN_DIR):$(PATH)"; export PATH; \
./$(WISH) $(SCRIPT)
# This target can be used to run wish inside either gdb or insight
gdb: binaries
@echo "set env TCL_LIBRARY=$(TCL_SRC_DIR_NATIVE)/library" > gdb.run
@echo "set env TK_LIBRARY=$(ROOT_DIR_NATIVE)/library" >> gdb.run
- PATH="$(PATH):$(TCL_BIN_DIR)"; export PATH; \
+ PATH="$(TCL_BIN_DIR):$(PATH)"; export PATH; \
gdb ./$(WISH) --command=gdb.run
@$(RM) gdb.run
@@ -593,9 +593,6 @@ testMain.$(OBJEXT): winMain.c
tkTest.$(OBJEXT): tkTest.c
$(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME)
-tkWinTest.$(OBJEXT): tkWinTest.c
- $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME)
-
tkSquare.$(OBJEXT): tkSquare.c
$(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME)