diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2008-12-18 15:36:45 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2008-12-18 15:36:45 (GMT) |
| commit | c61d3b006e4c4629bdd8962d0eb9c3f3596e539f (patch) | |
| tree | c40a71f512b9838fab19265a1f9e03b9ce39e51c /win/Makefile.in | |
| parent | 9f2870c4a88fbae81e4e09882e9cc91bcfea6038 (diff) | |
| download | tcl-c61d3b006e4c4629bdd8962d0eb9c3f3596e539f.zip tcl-c61d3b006e4c4629bdd8962d0eb9c3f3596e539f.tar.gz tcl-c61d3b006e4c4629bdd8962d0eb9c3f3596e539f.tar.bz2 | |
Try to do the wizardry again...
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index ebe7f5c..700af1f 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.139 2008/12/11 22:30:31 nijtmans Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.140 2008/12/18 15:36:45 dkf Exp $ VERSION = @TCL_VERSION@ @@ -99,6 +99,7 @@ GENERIC_DIR = @srcdir@/../generic TOMMATH_DIR = @srcdir@/../libtommath WIN_DIR = @srcdir@ COMPAT_DIR = @srcdir@/../compat +ZLIB_DIR = $(COMPAT_DIR)/zlib # Converts a POSIX path to a Windows native path. CYGPATH = @CYGPATH@ @@ -187,9 +188,11 @@ COPY = cp CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} \ -I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH -DMP_PREC=4 -I"${TOMMATH_DIR_NATIVE}" \ --I"${WIN_DIR_NATIVE}" ${AC_FLAGS} \ +-I"${WIN_DIR_NATIVE}" -I"${ZLIB_DIR}" ${AC_FLAGS} \ ${COMPILE_DEBUG_FLAGS} +ZLIB_LIB = libz.a + CC_OBJNAME = @CC_OBJNAME@ CC_EXENAME = @CC_EXENAME@ @@ -415,15 +418,19 @@ ${TCL_STUB_LIB_FILE}: ${STUB_OBJS} @MAKE_LIB@ ${STUB_OBJS} @POST_MAKE_LIB@ -${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES) +${TCL_DLL_FILE}: ${TCL_OBJS} ${ZLIB_DIR}${ZLIB_LIB} tcl.$(RES) @$(RM) ${TCL_DLL_FILE} - @MAKE_DLL@ ${TCL_OBJS} tcl.$(RES) $(SHLIB_LD_LIBS) + @MAKE_DLL@ ${TCL_OBJS} ${ZLIB_DIR}${ZLIB_LIB} tcl.$(RES) $(SHLIB_LD_LIBS) -${TCL_LIB_FILE}: ${TCL_OBJS} +${TCL_LIB_FILE}: ${TCL_OBJS} ${ZLIB_DIR}${ZLIB_LIB} @$(RM) ${TCL_LIB_FILE} - @MAKE_LIB@ ${TCL_OBJS} + @MAKE_LIB@ ${ZLIB_DIR}${ZLIB_LIB} ${TCL_OBJS} @POST_MAKE_LIB@ +# assume GNU make +${ZLIB_DIR}${ZLIB_LIB}: + ${MAKE} -C ${ZLIB_DIR} ${ZLIB_LIB} + ${DDE_DLL_FILE}: ${DDE_OBJS} ${TCL_STUB_LIB_FILE} @$(RM) ${DDE_DLL_FILE} @MAKE_DLL@ ${DDE_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS) |