Mercurial > forge
changeset 10395:28e8193a9258 octave-forge
Lapack of __disna_optim__, as an exception, may not be configured.
| author | i7tiol |
|---|---|
| date | Thu, 07 Jun 2012 13:27:29 +0000 |
| parents | b3916af6868d |
| children | 21df9d0b3359 |
| files | main/optim/src/Makefile |
| diffstat | 1 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/main/optim/src/Makefile Thu Jun 07 12:01:46 2012 +0000 +++ b/main/optim/src/Makefile Thu Jun 07 13:27:29 2012 +0000 @@ -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 # <carlo.defalco@gmail.com> 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 $<