diff options
author | dgp <dgp@users.sourceforge.net> | 2002-06-21 20:24:28 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2002-06-21 20:24:28 (GMT) |
commit | d14e8172b80a28a0249cbb292722f343377084e4 (patch) | |
tree | 1e20e4c8f678ab29d5692f249f20531cfa08961f /unix/Makefile.in | |
parent | 093ba20aa9429d1193d14f69c01efa197fb23b02 (diff) | |
download | tk-d14e8172b80a28a0249cbb292722f343377084e4.zip tk-d14e8172b80a28a0249cbb292722f343377084e4.tar.gz tk-d14e8172b80a28a0249cbb292722f343377084e4.tar.bz2 |
* Removed unnecessary dependence of tktest executable on the tcltest
executable on Unix. If there are similar dependencies on other
platforms, they can probably be removed as well. [Bug 572134].
Diffstat (limited to 'unix/Makefile.in')
-rw-r--r-- | unix/Makefile.in | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index dd2f1fa..b48dc78 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.69 2002/06/18 23:51:46 dkf Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.70 2002/06/21 20:24:29 dgp Exp $ # Current Tk version; used in various names. @@ -260,9 +260,7 @@ ${KEYSYM_FLAGS} WISH_OBJS = tkAppInit.o -TCLTEST_OBJS = ${TCL_BIN_DIR}/tclTest.o ${TCL_BIN_DIR}/tclThreadTest.o \ - ${TCL_BIN_DIR}/tclUnixTest.o -TKTEST_OBJS = $(TCLTEST_OBJS) tkTestInit.o tkTest.o tkSquare.o +TKTEST_OBJS = tkTestInit.o tkTest.o tkSquare.o WIDGOBJS = tkButton.o tkEntry.o tkFrame.o tkListbox.o \ tkMenu.o tkMenubutton.o tkMenuDraw.o tkMessage.o \ @@ -398,19 +396,13 @@ wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @TK_BUILD_LIB_SPEC@ \ $(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o wish -# This rule is executed if the user tried to run tktest without first -# building tcltest in the Tcl bin directory. Just do it for them. -${TCL_BIN_DIR}/tcltest: - cd ${TCL_BIN_DIR} ; \ - $(MAKE) tcltest - # Resetting the LIB_RUNTIME_DIR below is required so that # the generated tktest executable gets the build directory # burned into its ld search path. This keeps tktest from # picking up an already installed version of the Tcl or # Tk shared libraries. -tktest: ${TCL_BIN_DIR}/tcltest $(TKTEST_OBJS) $(TK_LIB_FILE) +tktest: $(TKTEST_OBJS) $(TK_LIB_FILE) $(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR) tktest-real: |