summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2008-12-23 08:55:30 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2008-12-23 08:55:30 (GMT)
commit62fff2d6771a68615c2f9019a893a97b051c8654 (patch)
treee2fa78764c7815d7e25635e794a4b1f7c480ccbe
parent4a02e8f7107c2512993c80f6a7046b5f28b6552e (diff)
downloadtcl-62fff2d6771a68615c2f9019a893a97b051c8654.zip
tcl-62fff2d6771a68615c2f9019a893a97b051c8654.tar.gz
tcl-62fff2d6771a68615c2f9019a893a97b051c8654.tar.bz2
Fix [Bug 2459725]
-rw-r--r--ChangeLog12
-rw-r--r--win/Makefile.in50
2 files changed, 33 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index 105efce..9710b79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,18 @@
+2008-12-23 Donal K. Fellows <dkf@users.sf.net>
+
+ * win/Makefile.in: Handle file extensions correctly. [Bug 2459725]
+
2008-12-22 Pat Thoyts <patthoyts@users.sourceforge.net>
*** 8.6b1 TAGGED FOR RELEASE ***
- * win/makefile.vc: [Bug 2458395] Ensure pkgs directories are
- suitable and quote the paths.
+ * win/makefile.vc: Ensure pkgs directories are suitable and quote the
+ paths. [Bug 2458395]
2008-12-22 Joe Mistachkin <joe@mistachkin.com>
- * tools/man2help2.tcl: Added support for "\(mi" nroff macro.
- [Bug 2330040]
+ * tools/man2help2.tcl: Added support for "\(mi" nroff macro. [Bug
+ 2330040]
2008-12-22 Pat Thoyts <patthoyts@users.sourceforge.net>
diff --git a/win/Makefile.in b/win/Makefile.in
index ccca697..1f6c664 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
# "./configure", which is a configuration script generated by the "autoconf"
# program (constructs like "@foo@" will get replaced in the actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.146 2008/12/20 22:06:02 kennykb Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.147 2008/12/23 08:55:30 dkf Exp $
VERSION = @TCL_VERSION@
@@ -387,18 +387,18 @@ STUB_OBJS = \
TCLSH_OBJS = tclAppInit.$(OBJEXT)
ZLIB_OBJS = \
- Zadler32$(OBJEXT) \
- Zcompress$(OBJEXT) \
- Zcrc32$(OBJEXT) \
- Zdeflate$(OBJEXT) \
- Zgzio$(OBJEXT) \
- Zinfback$(OBJEXT) \
- Zinffast$(OBJEXT) \
- Zinflate$(OBJEXT) \
- Zinftrees$(OBJEXT) \
- Ztrees$(OBJEXT) \
- Zuncompr$(OBJEXT) \
- Zzutil$(OBJEXT)
+ Zadler32.$(OBJEXT) \
+ Zcompress.$(OBJEXT) \
+ Zcrc32.$(OBJEXT) \
+ Zdeflate.$(OBJEXT) \
+ Zgzio.$(OBJEXT) \
+ Zinfback.$(OBJEXT) \
+ Zinffast.$(OBJEXT) \
+ Zinflate.$(OBJEXT) \
+ Zinftrees.$(OBJEXT) \
+ Ztrees.$(OBJEXT) \
+ Zuncompr.$(OBJEXT) \
+ Zzutil.$(OBJEXT)
TCL_OBJS = ${GENERIC_OBJS} $(TOMMATH_OBJS) ${WIN_OBJS} ${ZLIB_OBJS}
@@ -502,29 +502,29 @@ tclAppInit.${OBJEXT} : tclAppInit.c
# For building zlib, only used in some build configurations
-Zadler32$(OBJEXT): $(ZLIB_DIR)/adler32.c
+Zadler32.$(OBJEXT): $(ZLIB_DIR)/adler32.c
$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
-Zcompress$(OBJEXT): $(ZLIB_DIR)/compress.c
+Zcompress.$(OBJEXT): $(ZLIB_DIR)/compress.c
$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
-Zcrc32$(OBJEXT): $(ZLIB_DIR)/crc32.c
+Zcrc32.$(OBJEXT): $(ZLIB_DIR)/crc32.c
$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
-Zdeflate$(OBJEXT): $(ZLIB_DIR)/deflate.c
+Zdeflate.$(OBJEXT): $(ZLIB_DIR)/deflate.c
$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
-Zgzio$(OBJEXT): $(ZLIB_DIR)/gzio.c
+Zgzio.$(OBJEXT): $(ZLIB_DIR)/gzio.c
$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
-Zinfback$(OBJEXT): $(ZLIB_DIR)/infback.c
+Zinfback.$(OBJEXT): $(ZLIB_DIR)/infback.c
$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
-Zinffast$(OBJEXT): $(ZLIB_DIR)/inffast.c
+Zinffast.$(OBJEXT): $(ZLIB_DIR)/inffast.c
$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
-Zinflate$(OBJEXT): $(ZLIB_DIR)/inflate.c
+Zinflate.$(OBJEXT): $(ZLIB_DIR)/inflate.c
$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
-Zinftrees$(OBJEXT): $(ZLIB_DIR)/inftrees.c
+Zinftrees.$(OBJEXT): $(ZLIB_DIR)/inftrees.c
$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
-Ztrees$(OBJEXT): $(ZLIB_DIR)/trees.c
+Ztrees.$(OBJEXT): $(ZLIB_DIR)/trees.c
$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
-Zuncompr$(OBJEXT): $(ZLIB_DIR)/uncompr.c
+Zuncompr.$(OBJEXT): $(ZLIB_DIR)/uncompr.c
$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
-Zzutil$(OBJEXT): $(ZLIB_DIR)/zutil.c
+Zzutil.$(OBJEXT): $(ZLIB_DIR)/zutil.c
$(CC) -c -o $@ $(CC_SWITCHES) -I$(ZLIB_DIR) $<
tclZlib.${OBJEXT} : tclZlib.c