diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2008-12-20 21:40:27 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2008-12-20 21:40:27 (GMT) |
| commit | 6a64cdf71b3aa52680959e56d4d2c5fda3588f38 (patch) | |
| tree | fd0aaa89dac6861a15d29bc456cfc43d31044094 /win/Makefile.in | |
| parent | d02b97bef3315cfb2bb8350d63a6bbca58fc6134 (diff) | |
| download | tcl-6a64cdf71b3aa52680959e56d4d2c5fda3588f38.zip tcl-6a64cdf71b3aa52680959e56d4d2c5fda3588f38.tar.gz tcl-6a64cdf71b3aa52680959e56d4d2c5fda3588f38.tar.bz2 | |
* win/Makefile.in:
* win/configure.in: Renamed the static library libtcl86s.a to
have a name distinct from the import library
libtcl86.a. This renaming dodges an ancient
bug in the Makefile revealed by the last
commit where the $(TCL_LIB_FILE) rule can
fire to try to build the static library in
a --enable-shared build (and create a
static library that subsequently fails to
link).
*** POTENTIAL INCOMPATIBILITY *** for embedders
who link to the static library, but I couldn't
figure out how to sort this out any other
way.
* win/configure: Autoconf 2.59
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 78995e6..627b778 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.144 2008/12/20 16:32:32 dkf Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.145 2008/12/20 21:40:27 kennykb Exp $ VERSION = @TCL_VERSION@ @@ -101,7 +101,7 @@ TOMMATH_DIR = $(TOP_DIR)/libtommath WIN_DIR = $(TOP_DIR)/win COMPAT_DIR = $(TOP_DIR)/compat PKGS_DIR = $(TOP_DIR)/pkgs -ZLIB_DIR = $(COMPAT_DIR)/zlib +ZLIB_DIR = $(COMPAT_DIR)/zlib/ # Converts a POSIX path to a Windows native path. CYGPATH = @CYGPATH@ @@ -132,6 +132,8 @@ REGDOTVER = @TCL_REG_MAJOR_VERSION@.@TCL_REG_MINOR_VERSION@ TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ TCL_DLL_FILE = @TCL_DLL_FILE@ +TCL_STATIC_LIB_FILE = @TCL_STATIC_LIB_FILE@ +TCL_IMPORT_LIB_FILE = @TCL_IMPORT_LIB_FILE@ TCL_LIB_FILE = @TCL_LIB_FILE@ DDE_DLL_FILE = tcldde$(DDEVER)${DLLSUFFIX} DDE_LIB_FILE = tcldde$(DDEVER)${LIBSUFFIX} @@ -196,7 +198,7 @@ ${COMPILE_DEBUG_FLAGS} ZLIB_LIB = libz.a ZLIB_INC = -I"${ZLIB_DIR}" -ZLIB_FILE = "${ZLIB_DIR}/${ZLIB_LIB}" +ZLIB_FILE = ${ZLIB_DIR}${ZLIB_LIB} CC_OBJNAME = @CC_OBJNAME@ CC_EXENAME = @CC_EXENAME@ @@ -423,18 +425,18 @@ ${TCL_STUB_LIB_FILE}: ${STUB_OBJS} @MAKE_LIB@ ${STUB_OBJS} @POST_MAKE_LIB@ -${TCL_DLL_FILE}: ${TCL_OBJS} ${ZLIB_FILE} tcl.$(RES) - @$(RM) ${TCL_DLL_FILE} +${TCL_DLL_FILE} $(TCL_IMPORT_LIB_FILE): ${TCL_OBJS} ${ZLIB_FILE} tcl.$(RES) + @$(RM) ${TCL_DLL_FILE} $(TCL_IMPORT_LIB_FILE) @MAKE_DLL@ ${TCL_OBJS} ${ZLIB_FILE} tcl.$(RES) $(SHLIB_LD_LIBS) -${TCL_LIB_FILE}: ${TCL_OBJS} ${ZLIB_FILE} - @$(RM) ${TCL_LIB_FILE} +${TCL_STATIC_LIB_FILE}: ${TCL_OBJS} ${ZLIB_FILE} + @$(RM) ${TCL_STATIC_LIB_FILE} @MAKE_LIB@ ${ZLIB_FILE} ${TCL_OBJS} @POST_MAKE_LIB@ # assume GNU make ${ZLIB_FILE}: - ${MAKE} -C "${ZLIB_DIR}" CC="${CC}" ${ZLIB_LIB} + ${MAKE} -C ${ZLIB_DIR} CC="${CC}" ${ZLIB_LIB} ${DDE_DLL_FILE}: ${DDE_OBJS} ${TCL_STUB_LIB_FILE} @$(RM) ${DDE_DLL_FILE} @@ -746,7 +748,7 @@ clean: cleanhelp clean-packages $(RM) *.lib *.a *.exp *.dll *.$(RES) *.${OBJEXT} *~ \#* TAGS a.out $(RM) $(TCLSH) $(TCLTEST) $(CAT32) $(RM) *.pch *.ilk *.pdb - ${MAKE} -C "${ZLIB_DIR}" clean + ${MAKE} -C ${ZLIB_DIR} clean distclean: distclean-packages clean $(RM) Makefile config.status config.cache config.log tclConfig.sh \ |