Mercurial > octave-nkf

comparison build-aux/common.mk @ 15932:747dd82082c8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile * configure.ac, build-aux/common.mk (CROSS_TOOL_PREFIX, MKOCTFILE_CC, MKOCTFILE_CXX, MKOCTFILE_DL_LD, MKOCTFILE_DL_LDFLAGS, MKOCTFILE_F77, MKOCTFILE_LD_CXX): New variables. (do_subst_config_vals): Include MKOCTFILE_CC, MKOCTFILE_CXX, MKOCTFILE_DL_LD, MKOCTFILE_F77, and MKOCTFILE_LD_CXX in the list of substitutions. * mkoctfile.cc.in, mkoctfile.in (CC, CXX, DL_LD, F77, LD_CXX): Define from corresponding MKOCTFILE_ variables.
author John W. Eaton <jwe@octave.org>
date Fri, 11 Jan 2013 22:19:46 -0500
parents 834df9f10963
children 58018d0e9a71 a653526ea4a5
comparison
equal deleted inserted replaced
15931:e457139e7d8f 15932:747dd82082c8
1 CROSS_TOOL_PREFIX = @CROSS_TOOL_PREFIX@
2
1 AWK = @AWK@ 3 AWK = @AWK@
2 export AWK 4 export AWK
3 5
4 SED = @SED@ 6 SED = @SED@
5 export SED 7 export SED
161 SONAME_FLAGS = @SONAME_FLAGS@ 163 SONAME_FLAGS = @SONAME_FLAGS@
162 164
163 RDYNAMIC_FLAG = @RDYNAMIC_FLAG@ 165 RDYNAMIC_FLAG = @RDYNAMIC_FLAG@
164 166
165 FLIBS = @FLIBS@ 167 FLIBS = @FLIBS@
168
169 MKOCTFILE_CC = @MKOCTFILE_CC@
170 MKOCTFILE_CXX = @MKOCTFILE_CXX@
171 MKOCTFILE_DL_LD = @MKOCTFILE_DL_LD@
172 MKOCTFILE_DL_LDFLAGS = @MKOCTFILE_DL_LDFLAGS@
173 MKOCTFILE_F77 = @MKOCTFILE_F77@
174 MKOCTFILE_LD_CXX = @MKOCTFILE_LD_CXX@
175
176 # List of libraries and their special compilation flags
166 177
167 LIBOCTINTERP = @LIBOCTINTERP@ 178 LIBOCTINTERP = @LIBOCTINTERP@
168 LIBOCTAVE = @LIBOCTAVE@ 179 LIBOCTAVE = @LIBOCTAVE@
169 LIBCRUFT = @LIBCRUFT@ 180 LIBCRUFT = @LIBCRUFT@
170 181
537 -e "s|%OCTAVE_CONF_LIBS%|\"${LIBS}\"|" \ 548 -e "s|%OCTAVE_CONF_LIBS%|\"${LIBS}\"|" \
538 -e "s|%OCTAVE_CONF_LN_S%|\"${LN_S}\"|" \ 549 -e "s|%OCTAVE_CONF_LN_S%|\"${LN_S}\"|" \
539 -e "s|%OCTAVE_CONF_MAGICK_CPPFLAGS%|\"${MAGICK_CPPFLAGS}\"|" \ 550 -e "s|%OCTAVE_CONF_MAGICK_CPPFLAGS%|\"${MAGICK_CPPFLAGS}\"|" \
540 -e "s|%OCTAVE_CONF_MAGICK_LDFLAGS%|\"${MAGICK_LDFLAGS}\"|" \ 551 -e "s|%OCTAVE_CONF_MAGICK_LDFLAGS%|\"${MAGICK_LDFLAGS}\"|" \
541 -e "s|%OCTAVE_CONF_MAGICK_LIBS%|\"${MAGICK_LIBS}\"|" \ 552 -e "s|%OCTAVE_CONF_MAGICK_LIBS%|\"${MAGICK_LIBS}\"|" \
542 -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"@MKOCTFILE_DL_LDFLAGS@\"|' \ 553 -e 's|%OCTAVE_CONF_MKOCTFILE_CC%|\"${MKOCTFILE_CC}\"|' \
554 -e 's|%OCTAVE_CONF_MKOCTFILE_CXX%|\"${MKOCTFILE_CXX}\"|' \
555 -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LD%|\"${MKOCTFILE_DL_LD}\"|' \
556 -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${MKOCTFILE_DL_LDFLAGS}\"|' \
557 -e 's|%OCTAVE_CONF_MKOCTFILE_F77%|\"${MKOCTFILE_F77}\"|' \
558 -e 's|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${MKOCTFILE_LD_CXX}\"|' \
543 -e "s|%OCTAVE_CONF_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \ 559 -e "s|%OCTAVE_CONF_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \
544 -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \ 560 -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \
545 -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \ 561 -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \
546 -e "s|%OCTAVE_CONF_OCTLIBDIR%|\"${octlibdir}\"|" \ 562 -e "s|%OCTAVE_CONF_OCTLIBDIR%|\"${octlibdir}\"|" \
547 -e "s|%OCTAVE_CONF_OCT_LINK_DEPS%|\"${OCT_LINK_DEPS}\"|" \ 563 -e "s|%OCTAVE_CONF_OCT_LINK_DEPS%|\"${OCT_LINK_DEPS}\"|" \