diff options
| author | mdejong <mdejong> | 2001-06-22 23:59:48 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2001-06-22 23:59:48 (GMT) |
| commit | 653dd70d1e0efe8e90b7e8e44f7b1823d5bc0add (patch) | |
| tree | cb63c3adf3794d0d743e2a9d1852748190d231b8 /win/Makefile.in | |
| parent | 83ca1ca9b40094b453deb82faa202aa2d9fb7a03 (diff) | |
| download | tk-653dd70d1e0efe8e90b7e8e44f7b1823d5bc0add.zip tk-653dd70d1e0efe8e90b7e8e44f7b1823d5bc0add.tar.gz tk-653dd70d1e0efe8e90b7e8e44f7b1823d5bc0add.tar.bz2 | |
* unix/Makefile.in: Set CFLAGS to @CFLAGS@ and @CFLAGS_DEFAULT@.
Set LDFLAGS to @LDFLAGS@ and @LDFLAGS_DEFAULT@. Add LDFLAGS_DEBUG
and LDFLAGS_OPTIMIZE to match the way CFLAGS_DEFAULT works. Use
new LDFLAGS variable in the Makefile instead of @LDFLAGS@.
* unix/configure: Regen.
* unix/configure.in: Don't set CFLAGS to CFLAGS_DEFAULT, instead
subst CFLAGS_DEFAULT into the Makefile. Add AC_SUBST for CFLAGS_DEBUG,
CFLAGS_OPTIMIZE, LDFLAGS_DEFAULT, LDFLAGS_DEBUG, and LDFLAGS_OPTIMIZE.
Remove unused LD_FLAGS subst.
* unix/tcl.m4: Update from Tcl.
* win/Makefile.in: Set CFLAGS to @CFLAGS@ and @CFLAGS_DEFAULT@.
Set LDFLAGS to @LDFLAGS@ and @LDFLAGS_DEFAULT@.
* win/configure: Regen.
* win/configure.in: Don't set CFLAGS or LDFLAGS, instead subst
CFLAGS_DEFAULT and LDFLAGS_DEFAULT into the Makefile.
* win/tcl.m4: Update from Tcl.
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 29cc6eb..0a240d2 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.36 2001/03/30 21:53:12 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.37 2001/06/22 23:59:48 mdejong Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -161,7 +161,7 @@ LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ # Special compiler flags to use when building man2tcl on Windows. MAN2TCLFLAGS = @MAN2TCLFLAGS@ @@ -174,7 +174,7 @@ RES = @RES@ TK_RES = @TK_RES@ AC_FLAGS = @EXTRA_CFLAGS@ @DEFS@ CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@ @LDFLAGS_DEFAULT@ LDFLAGS_CONSOLE = @LDFLAGS_CONSOLE@ LDFLAGS_WINDOW = @LDFLAGS_WINDOW@ EXEEXT = @EXEEXT@ |