Mercurial > octave-nkf

comparison build-aux/common.mk @ 15167:1c711a646fa7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deprecate configure variables CC_VERSION, CXX_VERSION. Replaced with GCC_VERSION, GXX_VERSION. * NEWS: Announce deprecated variables CC_VERSION, CXX_VERSION. * common.mk: Add new substitutions for GCC_VERSION, GXX_VERSION * configure.ac: Add new substitutions for GCC_VERSION, GXX_VERSION * toplev.cc (Foctave_config_info): Add variables OCTAVE_CONF_GCC_VERSION, OCTAVE_CONF_GXX_VERSION to configure info report. * oct-conf.in.h: Add variables OCTAVE_CONF_GCC_VERSION, OCTAVE_CONF_GXX_VERSION to header file.
author Rik <rik@octave.org>
date Mon, 13 Aug 2012 14:04:26 -0700
parents d8a10cae1dcd
children 648dabbb4c6b
comparison
equal deleted inserted replaced
15166:8750f2cdc4f1 15167:1c711a646fa7
109 DEFS = @DEFS@ 109 DEFS = @DEFS@
110 110
111 UGLY_DEFS = @UGLY_DEFS@ 111 UGLY_DEFS = @UGLY_DEFS@
112 112
113 CC = @CC@ 113 CC = @CC@
114 ## FIXME: CC_VERSION is deprecated and should be removed in version 3.12
114 CC_VERSION = @CC_VERSION@ 115 CC_VERSION = @CC_VERSION@
116 GCC_VERSION = @GCC_VERSION@
115 CONFIGURE_CFLAGS = @CFLAGS@ 117 CONFIGURE_CFLAGS = @CFLAGS@
116 CPICFLAG = @CPICFLAG@ 118 CPICFLAG = @CPICFLAG@
117 XTRA_CFLAGS = @XTRA_CFLAGS@ 119 XTRA_CFLAGS = @XTRA_CFLAGS@
118 WARN_CFLAGS = @WARN_CFLAGS@ 120 WARN_CFLAGS = @WARN_CFLAGS@
119 AM_CFLAGS = $(CONFIGURE_CFLAGS) \ 121 AM_CFLAGS = $(CONFIGURE_CFLAGS) \
131 # endif 133 # endif
132 134
133 GRAPHICS_CFLAGS = @GRAPHICS_CFLAGS@ 135 GRAPHICS_CFLAGS = @GRAPHICS_CFLAGS@
134 136
135 CXX = @CXX@ 137 CXX = @CXX@
138 ## FIXME: CXX_VERSION is deprecated and should be removed in version 3.12
136 CXX_VERSION = @CXX_VERSION@ 139 CXX_VERSION = @CXX_VERSION@
140 GXX_VERSION = @GXX_VERSION@
137 CXXCPP = @CXXCPP@ 141 CXXCPP = @CXXCPP@
138 CONFIGURE_CXXFLAGS = @CXXFLAGS@ 142 CONFIGURE_CXXFLAGS = @CXXFLAGS@
139 CXXPICFLAG = @CXXPICFLAG@ 143 CXXPICFLAG = @CXXPICFLAG@
140 XTRA_CXXFLAGS = @XTRA_CXXFLAGS@ 144 XTRA_CXXFLAGS = @XTRA_CXXFLAGS@
141 WARN_CXXFLAGS = @WARN_CXXFLAGS@ 145 WARN_CXXFLAGS = @WARN_CXXFLAGS@
504 -e "s|%OCTAVE_CONF_DEPEND_FLAGS%|\"${DEPEND_FLAGS}\"|" \ 508 -e "s|%OCTAVE_CONF_DEPEND_FLAGS%|\"${DEPEND_FLAGS}\"|" \
505 -e "s|%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%|\"${DEPEND_EXTRA_SED_PATTERN}\"|" \ 509 -e "s|%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%|\"${DEPEND_EXTRA_SED_PATTERN}\"|" \
506 -e "s|%OCTAVE_CONF_DL_LD%|\"${DL_LD}\"|" \ 510 -e "s|%OCTAVE_CONF_DL_LD%|\"${DL_LD}\"|" \
507 -e "s|%OCTAVE_CONF_DL_LDFLAGS%|\"${DL_LDFLAGS}\"|" \ 511 -e "s|%OCTAVE_CONF_DL_LDFLAGS%|\"${DL_LDFLAGS}\"|" \
508 -e "s|%OCTAVE_CONF_DL_LIBS%|\"${DL_LIBS}\"|" \ 512 -e "s|%OCTAVE_CONF_DL_LIBS%|\"${DL_LIBS}\"|" \
513 -e "s|%OCTAVE_CONF_GCC_VERSION%|\"${GCC_VERSION}\"|" \
514 -e "s|%OCTAVE_CONF_GXX_VERSION%|\"${GXX_VERSION}\"|" \
509 -e "s|%OCTAVE_CONF_EXEEXT%|\"${EXEEXT}\"|" \ 515 -e "s|%OCTAVE_CONF_EXEEXT%|\"${EXEEXT}\"|" \
510 -e "s|%OCTAVE_CONF_F77%|\"${F77}\"|" \ 516 -e "s|%OCTAVE_CONF_F77%|\"${F77}\"|" \
511 -e "s|%OCTAVE_CONF_F77_FLOAT_STORE_FLAG%|\"${F77_FLOAT_STORE_FLAG}\"|" \ 517 -e "s|%OCTAVE_CONF_F77_FLOAT_STORE_FLAG%|\"${F77_FLOAT_STORE_FLAG}\"|" \
512 -e "s|%OCTAVE_CONF_F77_INTEGER_8_FLAG%|\"${F77_INTEGER_8_FLAG}\"|" \ 518 -e "s|%OCTAVE_CONF_F77_INTEGER_8_FLAG%|\"${F77_INTEGER_8_FLAG}\"|" \
513 -e "s|%OCTAVE_CONF_FC%|\"${FC}\"|" \ 519 -e "s|%OCTAVE_CONF_FC%|\"${FC}\"|" \