Mercurial > forge

changeset 6555:9bd1a8fcffd7 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
libSVM: fix for Matlab
author schloegl
date Sun, 10 Jan 2010 23:54:57 +0000
parents 7fa067e9944d
children d736430aaa42
files extra/NaN/src/Makefile
diffstat 1 files changed, 9 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/extra/NaN/src/Makefile	Sun Jan 10 23:26:31 2010 +0000
+++ b/extra/NaN/src/Makefile	Sun Jan 10 23:54:57 2010 +0000
@@ -1,11 +1,10 @@
 
-MATLABDIR = /usr/local/matlab
 CC  	= gcc
 CXX 	= g++
-CFLAGS 	= -Wall -Wconversion -O3 -fPIC -I/usr/include/octave
+CFLAGS 	= -Wall -Wconversion -O3 -fPIC
 OCTMEX	= mkoctfile --mex
 
-#CFLAGS	= -Wall -Wconversion -O3 -fPIC -I$(MATLABDIR)/extern/include
+MATLABDIR = /usr/local/matlab
 # comment the following line if you use MATLAB on 32-bit computer
 MEX_OPTION += -largeArrayDims
 MATMEX	= $(MATLABDIR)/bin/mex $(MEX_OPTION)
@@ -16,7 +15,7 @@
 
 $(PROGS): Makefile
 
-matlab: $(patsubst %_mex.cpp,%_mex.$(MEX_EXT),$(wildcard *.cpp)) Makefile
+matlab: $(patsubst %_mex.cpp,%_mex.$(MEX_EXT),$(wildcard *.cpp)) 
 
 %.oct: %.cc
 	mkoctfile $<
@@ -26,20 +25,16 @@
 %.$(MEX_EXT): %.cpp
 	$(MATMEX) $<           ## Matlab
 
-svmtrain_mex.mex:     svmtrain_mex.cpp svm.h svm.o svm_model_matlab.o
+svmtrain_mex.mex svmpredict_mex.mex:     svmtrain_mex.cpp svm.h
+	$(CXX) $(CFLAGS) -I /usr/include/octave -c svm.cpp
+	$(CC) $(CFLAGS)  -I /usr/include/octave -c svm_model_matlab.c
 	env CC=$(CXX) $(OCTMEX) svmtrain_mex.cpp svm.o svm_model_matlab.o
-svmpredict_mex.mex:     svmpredict_mex.cpp svm.h svm.o svm_model_matlab.o
 	env CC=$(CXX) $(OCTMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o
 
-svmtrain_mex.$(MEX_EXT):     svmtrain_mex.cpp svm.h svm.o svm_model_matlab.o
+svmtrain_mex.$(MEX_EXT) svmpredict_mex.$(MEX_EXT):     svmtrain_mex.cpp svm.h
+	$(CXX) $(CFLAGS) -I $(MATLABDIR)/extern/include -c svm.cpp
+	$(CC) $(CFLAGS)  -I $(MATLABDIR)/extern/include -c svm_model_matlab.c
 	$(MATMEX) svmtrain_mex.cpp svm.o svm_model_matlab.o
-svmpredict_mex.$(MEX_EXT):     svmpredict_mex.cpp svm.h svm.o svm_model_matlab.o
 	$(MATMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o
 
-svm_model_matlab.o:     svm_model_matlab.c svm.h
-	$(CC) $(CFLAGS) -c svm_model_matlab.c
-
-svm.o:  svm.cpp svm.h
-	$(CXX) $(CFLAGS) -c svm.cpp
-
 clean: ; -$(RM) *.o core octave-core *.oct *~ *.mex*