Mercurial > octave-nkf
changeset 13022:05534f03377d
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 | d55d396a9a55 |
| children | 7d1e11d922aa |
| files | libcruft/Makefile.am libcruft/link-deps.mk liboctave/Makefile.am liboctave/link-deps.mk src/Makefile.am src/link-deps.mk |
| diffstat | 6 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libcruft/Makefile.am Mon Aug 29 09:24:54 2011 +0200 +++ b/libcruft/Makefile.am Sun Aug 28 11:27:40 2011 -0400 @@ -36,7 +36,10 @@ include link-deps.mk -libcruft_la_LIBADD = $(LIBCRUFT_LINK_DEPS) +libcruft_la_LIBADD = \ + libranlib.la \ + ../libgnu/libgnu.la \ + $(LIBCRUFT_LINK_DEPS) # Increment these as needed and according to the rules in the libtool # manual:
--- a/libcruft/link-deps.mk Mon Aug 29 09:24:54 2011 +0200 +++ b/libcruft/link-deps.mk Sun Aug 28 11:27:40 2011 -0400 @@ -12,8 +12,6 @@ ## $(TRUNC_LIBM) LIBCRUFT_LINK_DEPS = \ - libranlib.la \ - ../libgnu/libgnu.la \ $(COPYSIGN_LIBM) \ $(FLOOR_LIBM) \ $(GETHOSTNAME_LIB) \
--- a/liboctave/Makefile.am Mon Aug 29 09:24:54 2011 +0200 +++ b/liboctave/Makefile.am Sun Aug 28 11:27:40 2011 -0400 @@ -505,6 +505,7 @@ include link-deps.mk liboctave_la_LIBADD = \ + ../libcruft/libcruft.la \ $(LIBOCTAVE_LINK_DEPS) liboctave_la_CPPFLAGS = \
--- a/liboctave/link-deps.mk Mon Aug 29 09:24:54 2011 +0200 +++ b/liboctave/link-deps.mk Sun Aug 28 11:27:40 2011 -0400 @@ -1,7 +1,6 @@ include ../libcruft/link-deps.mk LIBOCTAVE_LINK_DEPS = \ - ../libcruft/libcruft.la \ $(SPARSE_XLIBS) \ $(ARPACK_LIBS) \ $(QRUPDATE_LIBS) \
--- 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)