Mercurial > hg > octave-lyh
comparison build-aux/common.mk @ 13016:6b0798860fa4
maint: let libtool deal with setting -rpath linker option
* configure.ac (--enable-rpath): Delete option handler.
(RLD_FLAG): Delete variable and all uses.
* common.mk (RLD_FLAG): Don't substitute it.
(do_subst_config_vals): Don't substitute OCTAVE_CONF_RLD_FLAG.
* oct-conf.h.in (OCTAVE_CONF_RLD_FLAG): Delete definition.
* toplev.cc (octave_config_info): Delete RLD_FLAG from the list.
* libcruft/Makefile.am, liboctave/Makefile.am, src/Makefile.am,
src/link-deps.mk: Don't add RLD_FLAG to link options.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 27 Aug 2011 11:28:48 -0400 |
parents | edc5ec6e949b |
children | 834df9f10963 |
comparison
equal
deleted
inserted
replaced
13015:143003684835 | 13016:6b0798860fa4 |
---|---|
159 DL_LDFLAGS = @DL_LDFLAGS@ | 159 DL_LDFLAGS = @DL_LDFLAGS@ |
160 | 160 |
161 SONAME_FLAGS = @SONAME_FLAGS@ | 161 SONAME_FLAGS = @SONAME_FLAGS@ |
162 | 162 |
163 RDYNAMIC_FLAG = @RDYNAMIC_FLAG@ | 163 RDYNAMIC_FLAG = @RDYNAMIC_FLAG@ |
164 | |
165 RLD_FLAG = @RLD_FLAG@ | |
166 | 164 |
167 FLIBS = @FLIBS@ | 165 FLIBS = @FLIBS@ |
168 | 166 |
169 LIBOCTINTERP = @LIBOCTINTERP@ | 167 LIBOCTINTERP = @LIBOCTINTERP@ |
170 LIBOCTAVE = @LIBOCTAVE@ | 168 LIBOCTAVE = @LIBOCTAVE@ |
553 -e "s|%OCTAVE_CONF_QRUPDATE_LIBS%|\"${QRUPDATE_LIBS}\"|" \ | 551 -e "s|%OCTAVE_CONF_QRUPDATE_LIBS%|\"${QRUPDATE_LIBS}\"|" \ |
554 -e "s|%OCTAVE_CONF_RANLIB%|\"${RANLIB}\"|" \ | 552 -e "s|%OCTAVE_CONF_RANLIB%|\"${RANLIB}\"|" \ |
555 -e "s|%OCTAVE_CONF_RDYNAMIC_FLAG%|\"${RDYNAMIC_FLAG}\"|" \ | 553 -e "s|%OCTAVE_CONF_RDYNAMIC_FLAG%|\"${RDYNAMIC_FLAG}\"|" \ |
556 -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" \ | 554 -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" \ |
557 -e "s|%OCTAVE_CONF_REGEX_LIBS%|\"${REGEX_LIBS}\"|" \ | 555 -e "s|%OCTAVE_CONF_REGEX_LIBS%|\"${REGEX_LIBS}\"|" \ |
558 -e "s|%OCTAVE_CONF_RLD_FLAG%|\"${RLD_FLAG}\"|" \ | |
559 -e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \ | 556 -e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \ |
560 -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \ | 557 -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \ |
561 -e "s|%OCTAVE_CONF_SHLEXT%|\"${SHLEXT}\"|" \ | 558 -e "s|%OCTAVE_CONF_SHLEXT%|\"${SHLEXT}\"|" \ |
562 -e "s|%OCTAVE_CONF_SHLLINKEXT%|\"${SHLLINKEXT}\"|" \ | 559 -e "s|%OCTAVE_CONF_SHLLINKEXT%|\"${SHLLINKEXT}\"|" \ |
563 -e "s|%OCTAVE_CONF_SHLEXT_VER%|\"${SHLEXT_VER}\"|" \ | 560 -e "s|%OCTAVE_CONF_SHLEXT_VER%|\"${SHLEXT_VER}\"|" \ |