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

[<i7...@us...>]

Revision: 10581
          http://octave.svn.sourceforge.net/octave/?rev=10581&view=rev
Author:   i7tiol
Date:     2012-06-07 13:27:29 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
Lapack of __disna_optim__, as an exception, may not be configured.

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

Modified: trunk/octave-forge/main/optim/src/Makefile
===================================================================
--- trunk/octave-forge/main/optim/src/Makefile	2012-06-07 12:01:46 UTC (rev 10580)
+++ trunk/octave-forge/main/optim/src/Makefile	2012-06-07 13:27:29 UTC (rev 10581)
@@ -1,19 +1,30 @@
 MKOCTFILE ?= mkoctfile
 
 LAPACK_LIBS ?= $(shell $(MKOCTFILE) -p LAPACK_LIBS)
+OCTAVE_LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS)
 # reported necessary for Apple's VecLib framework by Carlo de Falco
 # <car...@gm...>
 BLAS_LIBS ?= $(shell $(MKOCTFILE) -p BLAS_LIBS)
+OCTAVE_BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS)
 
 # Passing LFLAGS, supplemented with LAPACK_LIBS and BLAS_LIBS, in the
 # environment to mkoctfile is prefered over passing LAPACK_LIBS and
 # BLAS_LIBS in mkoctfiles commandline due to mkoctfiles difficulties
 # with non-standard flags on some systems (e.g. -framework ... on
 # Apple)
-LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS)
+LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS)
+OCTAVE_LFLAGS := $(LFLAGS)
+LFLAGS += $(LAPACK_LIBS)
+LFLAGS += $(BLAS_LIBS)
+OCTAVE_LFLAGS += $(OCTAVE_LAPACK_LIBS)
+OCTAVE_LFLAGS += $(OCTAVE_BLAS_LIBS)
 
 all: __bfgsmin.oct numgradient.oct numhessian.oct samin.oct __disna_optim__.oct
 
+# __disna_optim__ should be linked to the same Lapack library as used by Octave
+__disna_optim__.oct: __disna_optim__.cc
+	LFLAGS="$(OCTAVE_LFLAGS)" $(MKOCTFILE) -s __disna_optim__.cc
+
 %.oct: %.cc
 	LFLAGS="$(LFLAGS)" $(MKOCTFILE) -s $<
 

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