Mercurial > hg > octave-thorsten

changeset 9533:a822193ba08a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more library-specific flags for various .oct files.
author John W. Eaton <jwe@octave.org>
date Mon, 17 Aug 2009 12:38:25 -0400
parents c4179ff88cf3
children baeecd69fd44
files src/ChangeLog src/Makefile.in
diffstat 2 files changed, 23 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-17  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (eigs.oct, chol.oct, qr.oct): Add library-specific
+	CPPFLAGS and LDFLAGS variables to CPPFLAGS and LDFLAGS.
+	From Benjamin Lindner <lindnerb@users.sourceforge.net>.
+
 2009-08-17  John W. Eaton  <jwe@octave.org>
 
 	* Makefile.in (OCTINTERP_LINK_DEPS): List $(LIBS) last.
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -662,17 +662,26 @@
   CPPFLAGS += $(QHULL_CPPFLAGS)
 __voronoi__.oct: OCT_LINK_DEPS += $(QHULL_LDFLAGS) $(QHULL_LIBS)
 
-eigs.d eigs.df eigs.o pic/eigs.o: CPPFLAGS += $(ARPACK_CPPFLAGS)
-eigs.oct: OCT_LINK_DEPS += $(ARPACK_LDFLAGS) $(ARPACK_LIBS) $(BLAS_LIBS)
+eigs.d eigs.df eigs.o pic/eigs.o:
+  CPPFLAGS += $(ARPACK_CPPFLAGS) $(SPARSE_CPPFLAGS)
+eigs.oct: \
+  OCT_LINK_DEPS += $(ARPACK_LDFLAGS) $(ARPACK_LIBS) \
+    $(SPARSE_LDFLAGS) $(SPARSE_LIBS) $(BLAS_LIBS)
 
 qz.d qz.df qz.o pic/qz.o:
 qz.oct: OCT_LINK_DEPS += $(BLAS_LIBS)
 
-qr.d qr.df qr.o pic/qr.o: CPPFLAGS += $(QRUPDATE_CPPFLAGS)
-qr.oct: OCT_LINK_DEPS += $(QRUPDATE_LDFLAGS) $(QRUPDATE_LIBS)
+qr.d qr.df qr.o pic/qr.o: \
+  CPPFLAGS += $(QRUPDATE_CPPFLAGS) $(SPARSE_CPPFLAGS)
+qr.oct: \
+  OCT_LINK_DEPS += $(QRUPDATE_LDFLAGS) $(QRUPDATE_LIBS) \
+    $(SPARSE_LDFLAGS) $(SPARSE_LIBS)
 
-chol.d chol.df chol.o pic/chol.o: CPPFLAGS += $(QRUPDATE_CPPFLAGS)
-chol.oct: OCT_LINK_DEPS += $(QRUPDATE_LDFLAGS) $(QRUPDATE_LIBS)
+chol.d chol.df chol.o pic/chol.o:
+  CPPFLAGS += $(QRUPDATE_CPPFLAGS) $(SPARSE_CPPFLAGS)
+chol.oct: \
+  OCT_LINK_DEPS += $(QRUPDATE_LDFLAGS) $(QRUPDATE_LIBS) \
+    $(SPARSE_LDFLAGS) $(SPARSE_LIBS)
 
 regexp.d regexp.df regexp.o pic/regexp.o: CPPFLAGS += $(REGEX_CPPFLAGS)
 regexp.oct: OCT_LINK_DEPS += $(REGEX_LDFLAGS) $(REGEX_LIBS)
@@ -686,7 +695,8 @@
 fltk_backend.d fltk_backend.df fltk_backend.o pic/fltk_backend.o: \
   CPPFLAGS += $(GRAPHICS_CPPFLAGS) $(FT2_CPPFLAGS)
 fltk_backend.oct: \
-  OCT_LINK_DEPS += $(GRAPHICS_LDFLAGS) $(GRAPHICS_LIBS) $(FT2_LDFLAGS) $(FT2_LIBS)
+  OCT_LINK_DEPS += $(GRAPHICS_LDFLAGS) $(GRAPHICS_LIBS) \
+    $(FT2_LDFLAGS) $(FT2_LIBS)
 
 amd.d amd.df pic/amd.o amd.o: CPPFLAGS += $(SPARSE_CPPFLAGS)
 amd.oct: OCT_LINK_DEPS += $(SPARSE_LDFLAGS) $(SPARSE_LIBS)