* win/Makefile.in:

	* win/tcl.rc:
	* win/tclsh.rc:
	* win/tclsh.ico:  Modified copyright dates in Windows resource
	files.  Added an icon for tclsh.exe.

5 files changed, 34 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d19d81..98adc49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-04-18    <redman@scriptics.com>
+
+	* win/Makefile.in:
+	* win/tcl.rc:
+	* win/tclsh.rc:
+	* win/tclsh.ico:  Modified copyright dates in Windows resource
+	files.  Added an icon for tclsh.exe.
+
 2000-04-17  Brent Welch <welch@scriptics.com>
 
 	* generic/tcl.h, generic/tclThreadTest.c, unix/tclUnixThrd.c,
diff --git a/win/Makefile.in b/win/Makefile.in
index ef9c8b4..9ef0363 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.30 2000/04/05 00:42:42 welch Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.31 2000/04/18 23:26:45 redman Exp $
 
 VERSION = @TCL_VERSION@
 
@@ -156,6 +156,7 @@ VPATH = $(GENERIC_DIR)@VPSEP@$(WIN_DIR)@VPSEP@$(COMPAT_DIR) # :
 
 AR		= @AR@
 CC		= @CC@
+RC		= @RC@
 AC_FLAGS	= @EXTRA_CFLAGS@ @DEFS@
 CPPFLAGS	= @CPPFLAGS@
 LDFLAGS		= @LDFLAGS@
@@ -310,11 +311,13 @@ winhelp: $(ROOT_DIR)/tools/man2help.tcl $(MAN2TCL)
 $(MAN2TCL): $(ROOT_DIR)/tools/man2tcl.c
 	$(CC) $(CFLAGS_OPTIMIZE) $(MAN2TCLFLAGS) -o $(MAN2TCL) "$(ROOT_DIR_NATIVE)"/tools/man2tcl.c
 
-$(TCLSH): $(TCL_LIB_FILE) $(TCLSH_OBJS)
-	$(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(LIBS) $(CC_EXENAME) 
+$(TCLSH): $(TCL_LIB_FILE) $(TCLSH_OBJS) tclsh.res
+	$(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(LIBS) \
+        tclsh.res $(CC_EXENAME) 
 
-$(TCLTEST): $(TCL_LIB_FILE) $(TCLTEST_OBJS) $(CAT32)
-	$(CC) $(CFLAGS) $(TCLTEST_OBJS) $(TCL_LIB_FILE) $(LIBS) $(CC_EXENAME) 
+$(TCLTEST): $(TCL_LIB_FILE) $(TCLTEST_OBJS) $(CAT32) tclsh.res
+	$(CC) $(CFLAGS) $(TCLTEST_OBJS) $(TCL_LIB_FILE) $(LIBS) \
+        tclsh.res $(CC_EXENAME) 
 
 cat32.${OBJEXT}: cat.c
 	$(CC) -c $(CC_SWITCHES) $(DEPARG) $(CC_OBJNAME)
@@ -329,9 +332,9 @@ ${TCL_STUB_LIB_FILE}: ${STUB_OBJS}
 	@$(RM) ${TCL_STUB_LIB_FILE}
 	@MAKE_LIB@ ${STUB_OBJS}
 
-${TCL_DLL_FILE}: ${TCL_OBJS}
+${TCL_DLL_FILE}: ${TCL_OBJS} tcl.res
 	@$(RM) ${TCL_DLL_FILE}
-	@MAKE_DLL@ ${TCL_OBJS}
+	@MAKE_DLL@ ${TCL_OBJS} tcl.res
 
 ${TCL_LIB_FILE}: ${TCL_OBJS}
 	@$(RM) ${TCL_LIB_FILE}
@@ -356,6 +359,8 @@ ${PIPE_DLL_FILE}: ${PIPE_OBJS}
 # automatically added.
 
 .SUFFIXES: .${OBJEXT}
+.SUFFIXES: .res
+.SUFFIXES: .rc
 
 # Special case object targets
 
@@ -397,6 +402,10 @@ tclStubLib.${OBJEXT}: tclStubLib.c
 .c.${OBJEXT}:
 	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl ${DEPARG} $(CC_OBJNAME)
 
+.rc.res:
+	$(RC) -fo $@ -r -i "$(GENERIC_DIR_NATIVE)" $(DEPARG)
+
+
 install: all install-binaries install-libraries install-doc
 
 install-binaries:
diff --git a/win/tcl.rc b/win/tcl.rc
index 56cf8ec..5b9a8cf 100644
--- a/win/tcl.rc
+++ b/win/tcl.rc
@@ -1,4 +1,4 @@
-// RCS: @(#) $Id: tcl.rc,v 1.4 1999/04/30 22:45:05 stanton Exp $
+// RCS: @(#) $Id: tcl.rc,v 1.5 2000/04/18 23:26:45 redman Exp $
 //
 // Version
 //
@@ -27,7 +27,7 @@ BEGIN
             VALUE "OriginalFilename", "tcl" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) ".dll\0"
             VALUE "CompanyName", "Scriptics Corporation\0"
             VALUE "FileVersion", TCL_PATCH_LEVEL
-            VALUE "LegalCopyright", "Copyright (c) 1999 by Scriptics Corporation\0"
+            VALUE "LegalCopyright", "Copyright (c) 2000 by Scriptics Corporation\0"
             VALUE "ProductName", "Tcl " TCL_VERSION " for Windows\0"
             VALUE "ProductVersion", TCL_PATCH_LEVEL
         END		    
diff --git a/win/tclsh.ico b/win/tclsh.ico
new file mode 100644
index 0000000..8bcaf48
--- /dev/null
+++ b/win/tclsh.ico
diff --git a/win/tclsh.rc b/win/tclsh.rc
index 201a6bc..874abd7 100644
--- a/win/tclsh.rc
+++ b/win/tclsh.rc
@@ -1,4 +1,4 @@
-// RCS: @(#) $Id: tclsh.rc,v 1.4 1999/04/30 22:45:05 stanton Exp $
+// RCS: @(#) $Id: tclsh.rc,v 1.5 2000/04/18 23:26:45 redman Exp $
 //
 // Version
 //
@@ -27,7 +27,7 @@ BEGIN
             VALUE "OriginalFilename", "tclsh" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) ".exe\0"
             VALUE "CompanyName", "Scriptics Corporation\0"
             VALUE "FileVersion", TCL_PATCH_LEVEL
-            VALUE "LegalCopyright", "Copyright (c) 1999 by Scriptics Corporation\0"
+            VALUE "LegalCopyright", "Copyright (c) 2000 by Scriptics Corporation\0"
             VALUE "ProductName", "Tcl " TCL_VERSION " for Windows\0"
             VALUE "ProductVersion", TCL_PATCH_LEVEL
         END
@@ -38,3 +38,9 @@ BEGIN
     END
 END
 
+//
+// Icon
+//
+
+tclsh                      ICON    DISCARDABLE     "tclsh.ico"
+