Mercurial > forge

changeset 8101:5dfc952387ba octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
workaround to avoid need for path to mex.h (INCOCTAVE)
author schloegl
date Wed, 25 May 2011 16:31:38 +0000
parents bc4cc726e8ad
children 577b01c1f760
files extra/NaN/src/Makefile
diffstat 1 files changed, 6 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/extra/NaN/src/Makefile	Wed May 25 15:26:19 2011 +0000
+++ b/extra/NaN/src/Makefile	Wed May 25 16:31:38 2011 +0000
@@ -7,11 +7,7 @@
 ### modify directories according to your needs 
 
 # Octave - global install  (e.g. from debian package)
-OCTAVE_VERSION = 
-INCOCTAVE = -I /usr/include/octave 
-# Octave - local install (e.g. compiled from sources): I recomend to compile with --enable-openmp 
-#OCTAVE_VERSION = -3.4.0
-#INCOCTAVE = -I /usr/local/include/octave$(OCTAVE_VERSION)/octave 
+# OCTAVE_VERSION = 
 
 # Matlab configuration
 MATLABDIR = /usr/local/MATLAB/R2010b
@@ -68,10 +64,10 @@
 	$(MATMEX) $<  -lz -lgomp      ## Matlab
 
 svmtrain_mex.mex svmpredict_mex.mex:     svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c
-	$(CXX) $(CFLAGS) $(INCOCTAVE) -c svm.cpp
-	$(CC)  $(CFLAGS) $(INCOCTAVE) -c svm_model_matlab.c
-	env CC=$(CXX) $(OCTMEX) svmtrain_mex.cpp svm.o svm_model_matlab.o
-	env CC=$(CXX) $(OCTMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o
+	$(CXX) $(CFLAGS) -c svm.cpp
+	#$(CC)  $(CFLAGS) $(INCOCTAVE) -c svm_model_matlab.c
+	env CC=$(CXX) $(OCTMEX) svmtrain_mex.cpp svm.o svm_model_matlab.c
+	env CC=$(CXX) $(OCTMEX) svmpredict_mex.cpp svm.o svm_model_matlab.c
 
 svmtrain_mex.$(MEX_EXT) svmpredict_mex.$(MEX_EXT):     svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c
 	$(CXX) $(CFLAGS) -I $(MATLABDIR)/extern/include -c svm.cpp
@@ -85,8 +81,7 @@
 	#$(MATMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o
 
 train.mex predict.mex: train.c linear.h tron.o linear.o linear_model_matlab.c
-	$(CC) $(CFLAGS) $(INCOCTAVE) -c linear_model_matlab.c
-	env CC=$(CXX) $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.o
+	env CC=$(CXX) $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.c
 	#env CC=$(CXX) $(OCTMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o
 
 linear.o: linear.cpp linear.h