Mercurial > octave-nkf

comparison build-aux/common.mk @ 15945:a653526ea4a5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use mkoctfile, not octave_config_info to get default pkg compiler tools * common.mk (MKOCTFILE_AR, MKOCTFILE_RANLIB): New variables. (do_subst_config_vals): Include MKOCTFILE_AR and MKOCTFILE_RANLIB in the list of substitutions. * configure.ac (MKOCTFILE_AR, MKOCTFILE_RANLIB): Additional mkoctfile values that receive special treatment when cross compiling. * pkg/pkg.m (configure_make): Use mkoctfile, not octave_config_info to get values for CC, CXX, AR, and RANLIB. * mkoctfile.cc.in, mkoctfile.in (AR, RANLIB): New variables. Update usage message.
author John W. Eaton <jwe@octave.org>
date Mon, 14 Jan 2013 15:07:04 -0500
parents 747dd82082c8
children 25eff7fe556d
comparison
equal deleted inserted replaced
15938:398ae067e811 15945:a653526ea4a5
164 164
165 RDYNAMIC_FLAG = @RDYNAMIC_FLAG@ 165 RDYNAMIC_FLAG = @RDYNAMIC_FLAG@
166 166
167 FLIBS = @FLIBS@ 167 FLIBS = @FLIBS@
168 168
169 MKOCTFILE_AR = @MKOCTFILE_AR@
169 MKOCTFILE_CC = @MKOCTFILE_CC@ 170 MKOCTFILE_CC = @MKOCTFILE_CC@
170 MKOCTFILE_CXX = @MKOCTFILE_CXX@ 171 MKOCTFILE_CXX = @MKOCTFILE_CXX@
171 MKOCTFILE_DL_LD = @MKOCTFILE_DL_LD@ 172 MKOCTFILE_DL_LD = @MKOCTFILE_DL_LD@
172 MKOCTFILE_DL_LDFLAGS = @MKOCTFILE_DL_LDFLAGS@ 173 MKOCTFILE_DL_LDFLAGS = @MKOCTFILE_DL_LDFLAGS@
173 MKOCTFILE_F77 = @MKOCTFILE_F77@ 174 MKOCTFILE_F77 = @MKOCTFILE_F77@
174 MKOCTFILE_LD_CXX = @MKOCTFILE_LD_CXX@ 175 MKOCTFILE_LD_CXX = @MKOCTFILE_LD_CXX@
176 MKOCTFILE_RANLIB = @MKOCTFILE_RANLIB@
175 177
176 # List of libraries and their special compilation flags 178 # List of libraries and their special compilation flags
177 179
178 LIBOCTINTERP = @LIBOCTINTERP@ 180 LIBOCTINTERP = @LIBOCTINTERP@
179 LIBOCTAVE = @LIBOCTAVE@ 181 LIBOCTAVE = @LIBOCTAVE@
548 -e "s|%OCTAVE_CONF_LIBS%|\"${LIBS}\"|" \ 550 -e "s|%OCTAVE_CONF_LIBS%|\"${LIBS}\"|" \
549 -e "s|%OCTAVE_CONF_LN_S%|\"${LN_S}\"|" \ 551 -e "s|%OCTAVE_CONF_LN_S%|\"${LN_S}\"|" \
550 -e "s|%OCTAVE_CONF_MAGICK_CPPFLAGS%|\"${MAGICK_CPPFLAGS}\"|" \ 552 -e "s|%OCTAVE_CONF_MAGICK_CPPFLAGS%|\"${MAGICK_CPPFLAGS}\"|" \
551 -e "s|%OCTAVE_CONF_MAGICK_LDFLAGS%|\"${MAGICK_LDFLAGS}\"|" \ 553 -e "s|%OCTAVE_CONF_MAGICK_LDFLAGS%|\"${MAGICK_LDFLAGS}\"|" \
552 -e "s|%OCTAVE_CONF_MAGICK_LIBS%|\"${MAGICK_LIBS}\"|" \ 554 -e "s|%OCTAVE_CONF_MAGICK_LIBS%|\"${MAGICK_LIBS}\"|" \
555 -e 's|%OCTAVE_CONF_MKOCTFILE_AR%|\"${MKOCTFILE_AR}\"|' \
553 -e 's|%OCTAVE_CONF_MKOCTFILE_CC%|\"${MKOCTFILE_CC}\"|' \ 556 -e 's|%OCTAVE_CONF_MKOCTFILE_CC%|\"${MKOCTFILE_CC}\"|' \
554 -e 's|%OCTAVE_CONF_MKOCTFILE_CXX%|\"${MKOCTFILE_CXX}\"|' \ 557 -e 's|%OCTAVE_CONF_MKOCTFILE_CXX%|\"${MKOCTFILE_CXX}\"|' \
555 -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LD%|\"${MKOCTFILE_DL_LD}\"|' \ 558 -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LD%|\"${MKOCTFILE_DL_LD}\"|' \
556 -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${MKOCTFILE_DL_LDFLAGS}\"|' \ 559 -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${MKOCTFILE_DL_LDFLAGS}\"|' \
557 -e 's|%OCTAVE_CONF_MKOCTFILE_F77%|\"${MKOCTFILE_F77}\"|' \ 560 -e 's|%OCTAVE_CONF_MKOCTFILE_F77%|\"${MKOCTFILE_F77}\"|' \
558 -e 's|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${MKOCTFILE_LD_CXX}\"|' \ 561 -e 's|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${MKOCTFILE_LD_CXX}\"|' \
562 -e 's|%OCTAVE_CONF_MKOCTFILE_RANLIB%|\"${MKOCTFILE_RANLIB}\"|' \
559 -e "s|%OCTAVE_CONF_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \ 563 -e "s|%OCTAVE_CONF_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \
560 -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \ 564 -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \
561 -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \ 565 -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \
562 -e "s|%OCTAVE_CONF_OCTLIBDIR%|\"${octlibdir}\"|" \ 566 -e "s|%OCTAVE_CONF_OCTLIBDIR%|\"${octlibdir}\"|" \
563 -e "s|%OCTAVE_CONF_OCT_LINK_DEPS%|\"${OCT_LINK_DEPS}\"|" \ 567 -e "s|%OCTAVE_CONF_OCT_LINK_DEPS%|\"${OCT_LINK_DEPS}\"|" \