Mercurial > octave-nkf

comparison src/Makefile.am @ 13016:6b0798860fa4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 05534f03377d
comparison
equal deleted inserted replaced
13015:143003684835 13016:6b0798860fa4
515 liboctinterp_age = 0 515 liboctinterp_age = 0
516 516
517 liboctinterp_version_info = $(liboctinterp_current):$(liboctinterp_revision):$(liboctinterp_age) 517 liboctinterp_version_info = $(liboctinterp_current):$(liboctinterp_revision):$(liboctinterp_age)
518 518
519 liboctinterp_la_LDFLAGS = \ 519 liboctinterp_la_LDFLAGS = \
520 $(RLD_FLAG) \
521 -version-info $(liboctinterp_version_info) \ 520 -version-info $(liboctinterp_version_info) \
522 $(NO_UNDEFINED_LDFLAG) \ 521 $(NO_UNDEFINED_LDFLAG) \
523 -bindir $(bindir) \ 522 -bindir $(bindir) \
524 $(LIBOCTINTERP_LINK_OPTS) 523 $(LIBOCTINTERP_LINK_OPTS)
525 524
526 display.df display.lo: CPPFLAGS += $(X11_FLAGS) 525 display.df display.lo: CPPFLAGS += $(X11_FLAGS)
527 526
528 octave_SOURCES = main.c 527 octave_SOURCES = main.c
529 528
530 octave_LDADD = liboctinterp.la $(OCTAVE_LINK_DEPS) 529 octave_LDADD = liboctinterp.la ../liboctave/liboctave.la ../libcruft/libcruft.la $(OCTAVE_LINK_DEPS)
531 530
532 octave_LDFLAGS = $(OCTAVE_LINK_OPTS) 531 octave_LDFLAGS = $(OCTAVE_LINK_OPTS)
533 532
534 ## Section for defining and creating DEF_FILES 533 ## Section for defining and creating DEF_FILES
535 SRC_DEF_FILES := $(shell $(srcdir)/find-defun-files.sh "$(srcdir)" $(DIST_SRC)) 534 SRC_DEF_FILES := $(shell $(srcdir)/find-defun-files.sh "$(srcdir)" $(DIST_SRC))