diff options
| author | hobbs <hobbs@noemail.net> | 2005-12-01 02:03:58 (GMT) |
|---|---|---|
| committer | hobbs <hobbs@noemail.net> | 2005-12-01 02:03:58 (GMT) |
| commit | 03659ea845a9124a0aeadc79971fdc51e19d4eed (patch) | |
| tree | 98fddf0b6fba2e3e04feabb10bf192e9586a86f5 /win | |
| parent | 4baefbd5d0745017f52bfd1da6bda87c3560afef (diff) | |
| download | tk-03659ea845a9124a0aeadc79971fdc51e19d4eed.zip tk-03659ea845a9124a0aeadc79971fdc51e19d4eed.tar.gz tk-03659ea845a9124a0aeadc79971fdc51e19d4eed.tar.bz2 | |
* win/Makefile.in: place TCL_BIN_DIR first in PATH for targets to
get Tcl built dll first.
FossilOrigin-Name: 770f90b7aac78e3d559d1ae0b93b0734df525cdc
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 17 |
1 files changed, 7 insertions, 10 deletions
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) |