diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2008-12-19 10:55:38 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2008-12-19 10:55:38 (GMT) |
| commit | 3862cdd11b0f2223852f907fcfc52a2978987f90 (patch) | |
| tree | 66c07a8c25bc46927e20f87ed8f67d2b83dd891e /win | |
| parent | f2070308a370f83bf12bcd7d309a3a52bbe5a6d7 (diff) | |
| download | tcl-3862cdd11b0f2223852f907fcfc52a2978987f90.zip tcl-3862cdd11b0f2223852f907fcfc52a2978987f90.tar.gz tcl-3862cdd11b0f2223852f907fcfc52a2978987f90.tar.bz2 | |
More autoconf hacking; now seems to be working fully on Unix...
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index a242720..eb5cd65 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.142 2008/12/19 02:46:07 kennykb Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.143 2008/12/19 10:55:38 dkf Exp $ VERSION = @TCL_VERSION@ @@ -190,11 +190,14 @@ 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}" -I"${ZLIB_DIR}" ${AC_FLAGS} \ +-I"${WIN_DIR_NATIVE}" ${AC_FLAGS} \ ${COMPILE_DEBUG_FLAGS} ZLIB_LIB = libz.a +ZLIB_INC = -I"${ZLIB_DIR}" +ZLIB_FILE = ${ZLIB_DIR}${ZLIB_LIB} + CC_OBJNAME = @CC_OBJNAME@ CC_EXENAME = @CC_EXENAME@ @@ -420,17 +423,17 @@ ${TCL_STUB_LIB_FILE}: ${STUB_OBJS} @MAKE_LIB@ ${STUB_OBJS} @POST_MAKE_LIB@ -${TCL_DLL_FILE}: ${TCL_OBJS} ${ZLIB_DIR}${ZLIB_LIB} tcl.$(RES) +${TCL_DLL_FILE}: ${TCL_OBJS} ${ZLIB_FILE} tcl.$(RES) @$(RM) ${TCL_DLL_FILE} - @MAKE_DLL@ ${TCL_OBJS} ${ZLIB_DIR}${ZLIB_LIB} tcl.$(RES) $(SHLIB_LD_LIBS) + @MAKE_DLL@ ${TCL_OBJS} ${ZLIB_FILE} tcl.$(RES) $(SHLIB_LD_LIBS) -${TCL_LIB_FILE}: ${TCL_OBJS} ${ZLIB_DIR}${ZLIB_LIB} +${TCL_LIB_FILE}: ${TCL_OBJS} ${ZLIB_FILE} @$(RM) ${TCL_LIB_FILE} - @MAKE_LIB@ ${ZLIB_DIR}${ZLIB_LIB} ${TCL_OBJS} + @MAKE_LIB@ ${ZLIB_FILE} ${TCL_OBJS} @POST_MAKE_LIB@ # assume GNU make -${ZLIB_DIR}${ZLIB_LIB}: +${ZLIB_FILE}: ${MAKE} -C ${ZLIB_DIR} CC="${CC}" ${ZLIB_LIB} ${DDE_DLL_FILE}: ${DDE_OBJS} ${TCL_STUB_LIB_FILE} @@ -486,6 +489,9 @@ tclWinTest.${OBJEXT}: tclWinTest.c tclAppInit.${OBJEXT} : tclAppInit.c $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) +tclZlib.${OBJEXT} : tclZlib.c + $(CC) -c ${ZLIB_INC} $(CC_SWITCHES) -DBUILD_tcl @DEPARG@ $(CC_OBJNAME) + # The following objects should be built using the stub interfaces tclWinReg.${OBJEXT} : tclWinReg.c |