Mercurial > octave-nkf

changeset 9532:c4179ff88cf3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
list LIBS last in OCTINTERP_LINK_DEPS
author John W. Eaton <jwe@octave.org>
date Mon, 17 Aug 2009 12:25:34 -0400
parents b859079d1644
children a822193ba08a
files src/ChangeLog src/Makefile.in
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Aug 17 12:19:33 2009 -0400
+++ b/src/ChangeLog	Mon Aug 17 12:25:34 2009 -0400
@@ -1,3 +1,7 @@
+2009-08-17  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (OCTINTERP_LINK_DEPS): List $(LIBS) last.
+
 2009-08-17  Michael Goffioul  <michael.goffioul@gmail.com>
 
 	* Makefile.in (OCTINTERP_LINK_DEPS): Include $(LIBCRUFT) and
--- a/src/Makefile.in	Mon Aug 17 12:19:33 2009 -0400
+++ b/src/Makefile.in	Mon Aug 17 12:25:34 2009 -0400
@@ -294,12 +294,14 @@
 endif
 
 OCTINTERP_LINK_DEPS = $(RLD_FLAG) -L../liboctave $(LIBOCTAVE) \
-  -L../libcruft $(LIBCRUFT) $(LIBS) \
-  $(HDF5_LIBS) $(ZLIB_LIBS) $(X11_LIBS) $(OPENGL_LIBS) $(CARBON_LIBS)
+  -L../libcruft $(LIBCRUFT) \
+  $(HDF5_LIBS) $(ZLIB_LIBS) \
+  $(OPENGL_LIBS) $(X11_LIBS) $(CARBON_LIBS) \
+  $(LIBS)
 
 OCT_LINK_DEPS = $(RLD_FLAG) -L. $(LIBOCTINTERP) \
-		-L../liboctave $(LIBOCTAVE) \
-		-L../libcruft $(LIBCRUFT)
+  -L../liboctave $(LIBOCTAVE) \
+  -L../libcruft $(LIBCRUFT)
 
 BUILT_DISTFILES = DOCSTRINGS oct-gperf.h parse.cc lex.cc y.tab.h \
 	$(OPT_HANDLERS) $(BUILT_EXTRAS)