Mercurial > hg > octave-max

changeset 10264:e58c1711d752

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/Makefile.am (OCTAVE_LIBS): include all liboctave library dependencies here
author John W. Eaton <jwe@octave.org>
date Thu, 04 Feb 2010 03:55:41 -0500
parents 07dedea2e0a4
children 8c583af2cf64
files src/ChangeLog src/Makefile.am
diffstat 2 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-04  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.am (OCTAVE_LIBS): Include all liboctave library
+	dependencies here.
+
 2010-02-03  Jaroslav Hajek  <highegg@gmail.com>
 
 	* ov-fcn-handle.h (octave_fcn_handle::anonymous): New static field.
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -487,15 +487,20 @@
     ../liboctave/liboctave.la \
     ../libcruft/libcruft.la \
     ../libgnu/libgnu.la \
+    $(SPARSE_XLDFLAGS) $(SPARSE_XLIBS) \
+    $(ARPACK_LDFLAGS) $(ARPACK_LIBS) \
+    $(QRUPDATE_LDFLAGS) $(QRUPDATE_LIBS) \
     $(FFTW_XLDFLAGS) $(FFTW_XLIBS) \
-    $(SPARSE_XLDFLAGS) $(SPARSE_XLIBS) \
+    $(LAPACK_LIBS) $(BLAS_LIBS) \
     $(GRAPHICS_LDFLAGS) $(GRAPHICS_LIBS) \
     $(FT2_LDFLAGS) $(FT2_LIBS) \
     $(HDF5_LDFLAGS) $(HDF5_LIBS) $(Z_LDFLAGS) $(Z_LIBS) \
     $(OPENGL_LIBS) $(X11_LIBS) $(CARBON_LIBS) \
     $(READLINE_LIBS) $(TERM_LIBS) \
     $(LIBGLOB) \
+    $(REGEX_LDFLAGS) $(REGEX_LIBS) \
     $(LAPACK_LIBS) $(BLAS_LIBS) \
+    $(DL_LIBS) $(PTHREAD_LIBS) \
     $(LIBS) \
     $(FLIBS)
 else
@@ -523,6 +528,7 @@
     $(READLINE_LIBS) $(TERM_LIBS) \
     $(LIBGLOB) \
     $(LAPACK_LIBS) $(BLAS_LIBS) \
+    $(DL_LIBS) $(PTHREAD_LIBS) \
     $(LIBS) \
     $(FLIBS)
 endif