matlab Makefile modified, octave removed

diff --git a/matlab/Makefile b/matlab/Makefile
index f05fab4fc11f0d4604c59d444d610a3107528bc7..c70a76fbdbd1e00ad166dd67c8259537822280f4 100644 (file)
--- a/matlab/Makefile
+++ b/matlab/Makefile
@@ -12,21 +12,12 @@ MEX_OPTION = CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
 MEX_OPTION += -largeArrayDims
 MEX_EXT = $(shell $(MATLABDIR)/bin/mexext)
 
-OCTAVEDIR ?= /usr/include/octave
-OCTAVE_MEX = env CC=$(CXX) mkoctfile
-OCTAVE_MEX_OPTION = --mex
-OCTAVE_MEX_EXT = mex
-OCTAVE_CFLAGS = -Wall -O3 -fPIC -I$(OCTAVEDIR) -I..
-
 all:   matlab
 
 matlab:        binary
 
 octave:
-       @make MEX="$(OCTAVE_MEX)" MEX_OPTION="$(OCTAVE_MEX_OPTION)" \
-       MEX_EXT="$(OCTAVE_MEX_EXT)" CFLAGS="$(OCTAVE_CFLAGS)" \
-       binary
-
+       @echo "please type make under Octave"
 binary: train.$(MEX_EXT) predict.$(MEX_EXT) libsvmread.$(MEX_EXT) libsvmwrite.$(MEX_EXT)
 
 train.$(MEX_EXT): train.c ../linear.h ../tron.o ../linear.o linear_model_matlab.o ../blas/blas.a