summaryrefslogtreecommitdiffstats
path: root/unix/Makefile.in
diff options
context:
space:
mode:
authormdejong <mdejong>2001-06-22 23:59:48 (GMT)
committermdejong <mdejong>2001-06-22 23:59:48 (GMT)
commit653dd70d1e0efe8e90b7e8e44f7b1823d5bc0add (patch)
treecb63c3adf3794d0d743e2a9d1852748190d231b8 /unix/Makefile.in
parent83ca1ca9b40094b453deb82faa202aa2d9fb7a03 (diff)
downloadtk-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 'unix/Makefile.in')
-rw-r--r--unix/Makefile.in15
1 files changed, 10 insertions, 5 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index d2cd6a0..489738e 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.50 2001/04/25 20:52:48 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.51 2001/06/22 23:59:48 mdejong Exp $
# Current Tk version; used in various names.
@@ -101,7 +101,12 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
#CFLAGS = $(CFLAGS_DEBUG)
#CFLAGS = $(CFLAGS_OPTIMIZE)
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@
+
+# Flags to pass to the linker
+LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
+LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@
+LDFLAGS = @LDFLAGS@ @LDFLAGS_DEFAULT@
# A "-I" switch that can be used when compiling to make all of the
# X11 include files accessible (the configure script will try to
@@ -385,7 +390,7 @@ objs: ${OBJS}
wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
- $(CC) @LDFLAGS@ $(WISH_OBJS) \
+ $(CC) $(LDFLAGS) $(WISH_OBJS) \
@TK_BUILD_LIB_SPEC@ \
$(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o wish
@@ -396,12 +401,12 @@ ${TCL_BIN_DIR}/tcltest:
make tcltest
tktest: ${TCL_BIN_DIR}/tcltest $(TKTEST_OBJS) $(TK_LIB_FILE)
- ${CC} @LDFLAGS@ $(TKTEST_OBJS) \
+ ${CC} $(LDFLAGS) $(TKTEST_OBJS) \
@TK_BUILD_LIB_SPEC@ \
$(WISH_LIBS) $(TK_CC_SEARCH_FLAGS) -o tktest
xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
- ${CC} @LDFLAGS@ test.o tkTest.o tkSquare.o \
+ ${CC} $(LDFLAGS) test.o tkTest.o tkSquare.o \
@TK_BUILD_LIB_SPEC@ \
$(WISH_LIBS) $(TK_LD_SEARCH_FLAGS) -lXt -o xttest