Mercurial > hg > octave-nkf
view src/link-deps.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 | 1609dd300c4d |
children | 05534f03377d |
line wrap: on
line source
include ../liboctave/link-deps.mk if AMCOND_ENABLE_DYNAMIC_LINKING LIBOCTINTERP_LINK_DEPS = else LIBOCTINTERP_LINK_DEPS = $(DLD_FUNCTIONS_LIBS) endif LIBOCTINTERP_LINK_DEPS += \ ../liboctave/liboctave.la \ $(GRAPHICS_LIBS) \ $(FT2_LIBS) \ $(HDF5_LIBS) \ $(Z_LIBS) \ $(OPENGL_LIBS) \ $(X11_LIBS) \ $(CARBON_LIBS) LIBOCTINTERP_LINK_OPTS = \ $(GRAPHICS_LDFLAGS) \ $(FT2_LDFLAGS) \ $(HDF5_LDFLAGS) \ $(Z_LDFLAGS) \ $(REGEX_LDFLAGS) OCT_LINK_DEPS = OCT_LINK_OPTS = \ $(NO_UNDEFINED_LDFLAG) \ $(LDFLAGS) if AMCOND_LINK_ALL_DEPS LIBOCTINTERP_LINK_DEPS += $(LIBOCTAVE_LINK_DEPS) LIBOCTINTERP_LINK_OPTS += $(LIBOCTAVE_LINK_OPTS) OCTAVE_LINK_DEPS = $(LIBOCTINTERP_LINK_DEPS) OCTAVE_LINK_OPTS = $(LIBOCTINTERP_LINK_OPTS) OCT_LINK_DEPS += $(LIBOCTINTERP_LINK_DEPS) OCT_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS) endif