summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authormdejong <mdejong>2001-09-10 03:23:54 (GMT)
committermdejong <mdejong>2001-09-10 03:23:54 (GMT)
commit39197f4f7fa16d70e84492838af16a77f76fc75a (patch)
treeab1e026bddfe17106d49e89e4691fd566ae5e995 /win
parentd1eec3b592e0f72cae2a2ee84afdcba0b817b1a1 (diff)
downloadtk-39197f4f7fa16d70e84492838af16a77f76fc75a.zip
tk-39197f4f7fa16d70e84492838af16a77f76fc75a.tar.gz
tk-39197f4f7fa16d70e84492838af16a77f76fc75a.tar.bz2
* win/Makefile.in: Fix Windows Makefile so that
tcltest will automatically be compiled if the user tries to build tktest.
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in11
1 files changed, 9 insertions, 2 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index fd25731..6f81cd4 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.43 2001/09/10 00:40:54 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.44 2001/09/10 03:23:54 mdejong Exp $
TCLVERSION = @TCL_VERSION@
VERSION = @TK_VERSION@
@@ -123,6 +123,7 @@ SHARED_LIBRARIES = $(TK_DLL_FILE) $(TK_STUB_LIB_FILE)
STATIC_LIBRARIES = $(TK_LIB_FILE)
WISH = wish$(VER)${EXESUFFIX}
+TCLTEST = $(TCL_BIN_DIR)/tcltest${EXEEXT}
TKTEST = tktest${EXEEXT}
CAT32 = cat32$(EXEEXT)
MAN2TCL = man2tcl$(EXEEXT)
@@ -500,7 +501,13 @@ $(WISH): $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(WISH_OBJS) wish.$(RES)
tktest : $(TKTEST)
-$(TKTEST): $(TK_LIB_FILE) $(TKTEST_OBJS) wish.$(RES) $(CAT32)
+# 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.
+$(TCLTEST):
+ cd ${TCL_BIN_DIR} ; \
+ make tcltest
+
+$(TKTEST): $(TCLTEST) $(TK_LIB_FILE) $(TKTEST_OBJS) wish.$(RES) $(CAT32)
$(CC) $(CFLAGS) $(TKTEST_OBJS_NATIVE) $(TCL_LIB_FILE) \
$(TK_LIB_FILE) $(LIBS) \
wish.$(RES) $(CC_EXENAME) $(LDFLAGS_WINDOW)