[Octave-cvsupdate] SF.net SVN: octave:[9485] trunk/octave-forge/main/optim

[<par...@us...>]

Revision: 9485
          http://octave.svn.sourceforge.net/octave/?rev=9485&view=rev
Author:   paramaniac
Date:     2011-12-29 23:10:26 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
optim: apply patch from Marco Atzeri, slightly modified to improve compatibility with older versions of make

Modified Paths:
--------------
    trunk/octave-forge/main/optim/DESCRIPTION
    trunk/octave-forge/main/optim/src/Makefile

Modified: trunk/octave-forge/main/optim/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/optim/DESCRIPTION	2011-12-29 22:49:10 UTC (rev 9484)
+++ trunk/octave-forge/main/optim/DESCRIPTION	2011-12-29 23:10:26 UTC (rev 9485)
@@ -3,7 +3,7 @@
 Date: 2011-11-30
 Author: Various Authors
 Maintainer: The Octave Community
-Title: Optimzation.
+Title: Optimization.
 Description: Non-linear optimization toolkit.
 Depends: octave (>= 2.9.7), miscellaneous (>= 1.0.10), struct (>= 1.0.9)
 Autoload: yes

Modified: trunk/octave-forge/main/optim/src/Makefile
===================================================================
--- trunk/octave-forge/main/optim/src/Makefile	2011-12-29 22:49:10 UTC (rev 9484)
+++ trunk/octave-forge/main/optim/src/Makefile	2011-12-29 23:10:26 UTC (rev 9485)
@@ -2,10 +2,12 @@
 MKOCTFILE := mkoctfile
 endif
 
+LAPACK_LIBS = $$(mkoctfile -p LAPACK_LIBS)
+
 all: __bfgsmin.oct numgradient.oct numhessian.oct samin.oct __disna_optim__.oct
 
 %.oct: %.cc
-	$(MKOCTFILE) -s $<
+	$(MKOCTFILE) -s $< ${LAPACK_LIBS}
 
 clean:
 	-rm *.o core octave-core *.oct *~

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.