diff options
Diffstat (limited to 'unix/Makefile.in')
| -rw-r--r-- | unix/Makefile.in | 15 |
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 |