diff options
| author | mdejong <mdejong> | 2003-01-13 07:30:58 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2003-01-13 07:30:58 (GMT) |
| commit | 24b85561272fc278646565a3a360142b28c05616 (patch) | |
| tree | 93911229c9f025533faaeddff8877ba605f5cffe /win/Makefile.in | |
| parent | 6e68f4745890b2e4288f902b558cd63f005887ef (diff) | |
| download | tk-24b85561272fc278646565a3a360142b28c05616.zip tk-24b85561272fc278646565a3a360142b28c05616.tar.gz tk-24b85561272fc278646565a3a360142b28c05616.tar.bz2 | |
* win/Makefile.in: Add TCL_DEFS to AC_FLAGS
so that compiler flags defined by Tcl get
passed to the compiler. Add empty rule
for cat.c so that Tk compiles under msys.
* win/configure: Regen.
* win/tcl.m4: Update from Tcl, this pulls
in a subst of TCL_DEFS, it also defines
USE_THREAD_ALLOC when threads are used
and it updates the SC_ENABLE_SYMBOLS
and SC_PROG_TCLSH macros to match the
ones used in Tcl.
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 199cdcf..8527a75 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.58 2002/09/04 17:44:55 andreas_kupries Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.59 2003/01/13 07:30:58 mdejong Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -168,7 +168,7 @@ CC = @CC@ RC = @RC@ RES = @RES@ TK_RES = @TK_RES@ -AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@ +AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@ @TCL_DEFS@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ @LDFLAGS_DEFAULT@ LDFLAGS_CONSOLE = @LDFLAGS_CONSOLE@ @@ -531,6 +531,9 @@ $(TKTEST): $(TK_LIB_FILE) $(TKTEST_OBJS) wish.$(RES) $(CAT32) $(TK_LIB_FILE) $(LIBS) \ wish.$(RES) $(CC_EXENAME) $(LDFLAGS_WINDOW) +# Msys make requires this next rule for some reason. +$(TCL_SRC_DIR)/win/cat.c: + cat32.${OBJEXT}: $(TCL_SRC_DIR)/win/cat.c $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) |