Mercurial > octave-nkf

diff 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
line wrap: on
line diff
--- a/src/Makefile.am	Mon Aug 29 09:24:54 2011 +0200
+++ b/src/Makefile.am	Sun Aug 28 11:27:40 2011 -0400
@@ -507,7 +507,10 @@
 
 include link-deps.mk
 
-liboctinterp_la_LIBADD = $(LIBOCTINTERP_LINK_DEPS)
+liboctinterp_la_LIBADD = \
+  ../liboctave/liboctave.la \
+  ../libcruft/libcruft.la \
+  $(LIBOCTINTERP_LINK_DEPS)
 
 # Increment these as needed and according to the rules in the libtool manual:
 liboctinterp_current = 0
@@ -526,7 +529,11 @@
 
 octave_SOURCES = main.c
 
-octave_LDADD = liboctinterp.la ../liboctave/liboctave.la ../libcruft/libcruft.la $(OCTAVE_LINK_DEPS)
+octave_LDADD = \
+  liboctinterp.la \
+  ../liboctave/liboctave.la \
+  ../libcruft/libcruft.la \
+  $(OCTAVE_LINK_DEPS)
 
 octave_LDFLAGS = $(OCTAVE_LINK_OPTS)