Mercurial > octave-nkf

comparison src/Makefile.am @ 13022:05534f03377d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: ensure we always link with local libtool libraries * libcruft/Makefile.in (libcruft_LIBADD): List Octave's libtool libraries here. * libcruft/link-deps.mk (LIBCRUFT_LINK_DEPS): Not here. * liboctave/Makefile.in (liboctave_LIBADD): List Octave's libtool libraries here. * liboctave/link-deps.mk (LIBOCTAVE_LINK_DEPS): Not here. * src/Makefile.in (LIBOCTAVE_LIBADD, octave_LDADD): List Octave's libtool libraries here. * src/link-deps.mk (LIBOCTINTERP_LINK_DEPS): Not here.
author John W. Eaton <jwe@octave.org>
date Sun, 28 Aug 2011 11:27:40 -0400
parents 6b0798860fa4
children f3c53fea9fb5
comparison
equal deleted inserted replaced
13021:d55d396a9a55 13022:05534f03377d
505 505
506 liboctinterp_la_CPPFLAGS = @OCTINTERP_DLL_DEFS@ $(AM_CPPFLAGS) 506 liboctinterp_la_CPPFLAGS = @OCTINTERP_DLL_DEFS@ $(AM_CPPFLAGS)
507 507
508 include link-deps.mk 508 include link-deps.mk
509 509
510 liboctinterp_la_LIBADD = $(LIBOCTINTERP_LINK_DEPS) 510 liboctinterp_la_LIBADD = \
511 ../liboctave/liboctave.la \
512 ../libcruft/libcruft.la \
513 $(LIBOCTINTERP_LINK_DEPS)
511 514
512 # Increment these as needed and according to the rules in the libtool manual: 515 # Increment these as needed and according to the rules in the libtool manual:
513 liboctinterp_current = 0 516 liboctinterp_current = 0
514 liboctinterp_revision = 0 517 liboctinterp_revision = 0
515 liboctinterp_age = 0 518 liboctinterp_age = 0
524 527
525 display.df display.lo: CPPFLAGS += $(X11_FLAGS) 528 display.df display.lo: CPPFLAGS += $(X11_FLAGS)
526 529
527 octave_SOURCES = main.c 530 octave_SOURCES = main.c
528 531
529 octave_LDADD = liboctinterp.la ../liboctave/liboctave.la ../libcruft/libcruft.la $(OCTAVE_LINK_DEPS) 532 octave_LDADD = \
533 liboctinterp.la \
534 ../liboctave/liboctave.la \
535 ../libcruft/libcruft.la \
536 $(OCTAVE_LINK_DEPS)
530 537
531 octave_LDFLAGS = $(OCTAVE_LINK_OPTS) 538 octave_LDFLAGS = $(OCTAVE_LINK_OPTS)
532 539
533 ## Section for defining and creating DEF_FILES 540 ## Section for defining and creating DEF_FILES
534 SRC_DEF_FILES := $(shell $(srcdir)/find-defun-files.sh "$(srcdir)" $(DIST_SRC)) 541 SRC_DEF_FILES := $(shell $(srcdir)/find-defun-files.sh "$(srcdir)" $(DIST_SRC))