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

[<cd...@us...>]

Revision: 10529
          http://octave.svn.sourceforge.net/octave/?rev=10529&view=rev
Author:   cdf
Date:     2012-05-28 07:55:30 +0000 (Mon, 28 May 2012)
Log Message:
-----------
makefile change to support linking apple veclib

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

Modified: trunk/octave-forge/main/odepkg/src/Makefile
===================================================================
--- trunk/octave-forge/main/odepkg/src/Makefile	2012-05-27 20:31:31 UTC (rev 10528)
+++ trunk/octave-forge/main/odepkg/src/Makefile	2012-05-28 07:55:30 UTC (rev 10529)
@@ -9,7 +9,9 @@
 
 # MKOCTFILE = $(MKOCTFILE) has already been defined in Makeconf
 # MKMEXFILE = $(MKOCTFILE) --mex
-MKOCTFILE = mkoctfile
+MKOCTFILE ?= mkoctfile
+
+FFLAGS := $(shell $(MKOCTFILE) -p FFLAGS)
 ifeq (gfortran,$(findstring gfortran,$(F77)))
   MKF77FILE = FFLAGS="-fno-automatic $(FFLAGS)" $(MKOCTFILE)
 endif
@@ -20,8 +22,8 @@
   MKF77FILE = FFLAGS="$(FFLAGS)" $(MKOCTFILE)
 endif
 
-LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS)
-FLIBS := $(shell mkoctfile -p FLIBS)
+LAPACK_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) $(shell $(MKOCTFILE) -p LAPACK_LIBS)
+FLIBS := $(shell $(MKOCTFILE) -p FLIBS)
 
 EXTERNALDIRS  = hairer cash daskr
 EXTERNALPACKS = $(patsubst %, %.tgz,  $(EXTERNALDIRS))

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