From 58f7859a949b1f9107d37f66aa6f44ba75490b39 Mon Sep 17 00:00:00 2001 From: popo Date: Wed, 23 Feb 2011 22:57:08 +0000 Subject: [PATCH] In matlab interface, tron.o and linear.o are in the parent directory now. matlab/README is also slightly modified. --- matlab/Makefile | 18 +++++++++--------- matlab/README | 4 ---- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/matlab/Makefile b/matlab/Makefile index e44cd1e..0a6df1f 100644 --- a/matlab/Makefile +++ b/matlab/Makefile @@ -29,11 +29,11 @@ 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 - $(MEX) $(MEX_OPTION) train.c tron.o linear.o linear_model_matlab.o ../blas/blas.a +train.$(MEX_EXT): train.c ../linear.h ../tron.o ../linear.o linear_model_matlab.o ../blas/blas.a + $(MEX) $(MEX_OPTION) train.c ../tron.o ../linear.o linear_model_matlab.o ../blas/blas.a -predict.$(MEX_EXT): predict.c ../linear.h tron.o linear.o linear_model_matlab.o ../blas/blas.a - $(MEX) $(MEX_OPTION) predict.c tron.o linear.o linear_model_matlab.o ../blas/blas.a +predict.$(MEX_EXT): predict.c ../linear.h ../tron.o ../linear.o linear_model_matlab.o ../blas/blas.a + $(MEX) $(MEX_OPTION) predict.c ../tron.o ../linear.o linear_model_matlab.o ../blas/blas.a libsvmread.$(MEX_EXT): libsvmread.c $(MEX) $(MEX_OPTION) libsvmread.c @@ -44,15 +44,15 @@ libsvmwrite.$(MEX_EXT): libsvmwrite.c linear_model_matlab.o: linear_model_matlab.c ../linear.h $(CXX) $(CFLAGS) -c linear_model_matlab.c -linear.o: ../linear.cpp ../linear.h - $(CXX) $(CFLAGS) -c ../linear.cpp +../linear.o: + cd ..; make linear.o -tron.o: ../tron.cpp ../tron.h - $(CXX) $(CFLAGS) -c ../tron.cpp +../tron.o: + cd ..; make tron.o ../blas/blas.a: cd ../blas; make OPTFLAGS='$(CFLAGS)' CC='$(CC)'; clean: cd ../blas; make clean - rm -f *~ *.o *.mex* *.obj + rm -f *~ *.o *.mex* *.obj ../linear.o ../tron.o diff --git a/matlab/README b/matlab/README index d20884c..7ede401 100644 --- a/matlab/README +++ b/matlab/README @@ -62,10 +62,6 @@ Example: matlab> make -Under 64-bit Windows, Visual Studio 2005 user will need "X64 Compiler and Tools". -The package won't be installed by default, but you can find it in customized -installation options. - For list of supported/compatible compilers for MATLAB, please check the following page: -- 2.50.1