summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorredman <redman>1999-07-13 22:23:44 (GMT)
committerredman <redman>1999-07-13 22:23:44 (GMT)
commit20317564b93519a34429e3c276553da52f042dae (patch)
treec64b8824603df005185359b27a4e0e17d467e69d /win
parentdff386f7a7bd202aa409d20e4512b65af07ac24f (diff)
downloadtcl-20317564b93519a34429e3c276553da52f042dae.zip
tcl-20317564b93519a34429e3c276553da52f042dae.tar.gz
tcl-20317564b93519a34429e3c276553da52f042dae.tar.bz2
Makefile.in: fixed cat32.exe build
makefile.vc: fixed calling tcltest.exe
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in6
-rw-r--r--win/makefile.vc7
2 files changed, 6 insertions, 7 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index d45c7ea..8610d34 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.14 1999/07/08 23:17:56 stanton Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.15 1999/07/13 22:23:44 redman Exp $
VERSION = @TCL_VERSION@
@@ -283,8 +283,10 @@ $(TCLSH): $(TCL_LIB_FILE) $(TCLSH_OBJS)
$(TCLTEST): $(TCL_LIB_FILE) $(TCLTEST_OBJS) $(CAT32)
$(CC) $(CFLAGS) $(TCLTEST_OBJS) $(TCL_LIB_FILE) $(LIBS) $(CC_EXENAME)
-$(CAT32): cat.c
+cat32.obj: cat.c
$(CC) -c $(CC_SWITCHES) $(DEPARG) $(CC_OBJNAME)
+
+$(CAT32): cat32.obj
$(CC) $(CFLAGS) cat32.obj $(CC_EXENAME) -link $(LDFLAGS_CONSOLE)
# The following targets are configured by autoconf to generate either
diff --git a/win/makefile.vc b/win/makefile.vc
index e9c6b0c..f7a2a76 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -6,7 +6,7 @@
# Copyright (c) 1995-1996 Sun Microsystems, Inc.
# Copyright (c) 1998-1999 by Scriptics Corporation.
#
-# RCS: @(#) $Id: makefile.vc,v 1.37 1999/07/11 20:29:57 redman Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.38 1999/07/13 22:23:45 redman Exp $
# Does not depend on the presence of any environment variables in
# order to compile tcl; all needed information is derived from
@@ -323,10 +323,7 @@ plugin: setup $(TCLPLUGINDLL) $(TCLSHP)
install: install-binaries install-libraries
test: setup $(TCLTEST) dlls $(CAT16) $(CAT32)
set TCL_LIBRARY=$(ROOT)/library
- $(TCLTEST) << "$(TCLREGDLL)"
- load [lindex $$argv 0] registry
- source $(ROOT)/tests/all.tcl
-<<
+ $(TCLTEST) $(ROOT)/tests/all.tcl
setup:
@$(MKDIR) $(TMPDIR)