Mercurial > forge

changeset 12384:5d1eadad45d4 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tsa, nan: fix built for mex4m
author schloegl
date Wed, 26 Feb 2014 17:53:16 +0000
parents a06636a6401d
children 2da9cb6c5c7e
files extra/NaN/src/Makefile extra/tsa/src/Makefile
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/extra/NaN/src/Makefile	Wed Feb 26 17:26:20 2014 +0000
+++ b/extra/NaN/src/Makefile	Wed Feb 26 17:53:16 2014 +0000
@@ -50,7 +50,7 @@
 ifndef MATLABDIR
   ifneq (,$(shell ls -1 /usr/local/ |grep MATLAB))
     # use oldest, typically mex-files a compatible with newer Matlab versions 
-    MATLABDIR=$(shell ls -1t /usr/local/MATLAB/  |grep "^R*" |head -1)
+    MATLABDIR=/usr/local/MATLAB/$(shell ls -1t /usr/local/MATLAB/  |grep "^R*" |head -1)
     # alternatively, use latest matlab version
     #MATLABDIR=$(shell ls -dt1 /usr/local/MATLAB/R* |head -1)
   endif
@@ -81,9 +81,9 @@
 	mkoctfile$(OCTAVE_VERSION) "$<"
 
 %.mex: %.cpp
-	$(OCTMEX) "$<" -lgomp         ## Octave
+	$(OCTMEX) "$<" -lgomp
 %.$(MEX_EXT): %.cpp
-	$(MATMEX) "$<" -lgomp      ## Matlab
+	$(MATMEX) "$<" -lgomp
 
 svmtrain_mex.mex svmpredict_mex.mex: svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c svmpredict_mex.cpp
 	$(CXX) $(CFLAGS) -c svm.cpp
--- a/extra/tsa/src/Makefile	Wed Feb 26 17:26:20 2014 +0000
+++ b/extra/tsa/src/Makefile	Wed Feb 26 17:53:16 2014 +0000
@@ -60,7 +60,7 @@
 ifndef MATLABDIR
   ifneq (,$(shell ls -1 /usr/local/ |grep MATLAB))
     # use oldest, typically mex-files a compatible with newer Matlab versions 
-    MATLABDIR=$(shell ls -1t /usr/local/MATLAB/  |grep "^R*" |head -1)
+    MATLABDIR=/usr/local/MATLAB/$(shell ls -1t /usr/local/MATLAB/  |grep "^R*" |head -1)
     # alternatively, use latest matlab version
     #MATLABDIR=$(shell ls -dt1 /usr/local/MATLAB/R* |head -1)
   endif
@@ -91,9 +91,9 @@
 	mkoctfile$(OCTAVE_VERSION) "$<"
 
 %.mex: %.cpp
-	$(OCTMEX) "$<"  -lgomp -llapack -lblas     ## Octave
+	$(OCTMEX) "$<"  -lgomp -llapack -lblas
 %.$(MEX_EXT): %.cpp
-	$(MATMEX) "$<"  -lgomp -llapack -lblas     ## Matlab
+	$(MATMEX) "$<"  -lgomp -llapack -lblas
 
 
 #########################################################