Mercurial > forge

changeset 12594:faae8e81f0ff octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[nan] simplify Makefile - options of system libraries (libsvm liblinear) are not supported anymore
author schloegl
date Sun, 12 Apr 2015 21:07:09 +0000
parents 0605cb0434ff
children 548f272f5db9
files extra/NaN/DESCRIPTION extra/NaN/src/Makefile
diffstat 2 files changed, 6 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/extra/NaN/DESCRIPTION	Sun Apr 12 20:26:42 2015 +0000
+++ b/extra/NaN/DESCRIPTION	Sun Apr 12 21:07:09 2015 +0000
@@ -1,12 +1,11 @@
 Name: NaN
-Version: 2.9.0
-Date: 2015-04-06
+Version: 2.7.4
+Date: 2015-04-12
 Author: Alois Schloegl <alois.schloegl@ist.ac.at>
 Maintainer: Alois Schloegl
 Title: The NaN-toolbox
 Description: A statistics and machine learning toolbox for data with and w/o missing values
 Depends: octave (> 3.2.0)
-BuildDepends: libsvm-dev (>2.8), liblinear-dev (> 1.50)
 License: GPLv3+
 Url: http://pub.ist.ac.at/~schloegl/matlab/NaN
 Autoload: no
--- a/extra/NaN/src/Makefile	Sun Apr 12 20:26:42 2015 +0000
+++ b/extra/NaN/src/Makefile	Sun Apr 12 21:07:09 2015 +0000
@@ -81,37 +81,20 @@
 #########################################################
 #	Octave, MATLAB on Linux 
 #########################################################
-ifeq (,$(wildcard /usr/include/libsvm/svm.h))
-## package libsvm-dev is not installed
 svm%_mex.mex: svm%_mex.cpp svm.o svm_model_octave.o
 	env CC=$(CXX) $(OCTMEX) "$<" svm.o svm_model_octave.o
 svm%_mex.$(MEX_EXT): svm%_mex.cpp svm.o svm_model_matlab.o
 	$(MATMEX) "$<" svm.o svm_model_matlab.o
-%.$(MEX_EXT): %.cpp svm.o svm_model_matlab.o
-	$(MATMEX) "$<" svm.o svm_model_matlab.o
+%.$(MEX_EXT): %.cpp
+	$(MATMEX) "$<"
 
 svm_model_octave.o: svm_model_matlab.c 
-	$(CC)  $(CFLAGS) $(shell $(OCTMEX) -p INCFLAGS) -o svm_model_octave.o -c svm_model_matlab.c 
+	$(CC)  $(CFLAGS) $(shell $(OCTMEX) -p INCFLAGS) -o "$@" -c "$<"
 svm_model_matlab.o: svm_model_matlab.c 
-	$(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -c svm_model_matlab.c 
+	$(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -o "$@" -c "$<"  
 svm.o: svm.cpp
-	echo "It's recommended to install the package libsvm-dev."
 	$(CC) $(CFLAGS) -c svm.cpp
 
-else
-## package libsvm-dev is installed
-svm%_mex.mex: svm%_mex.cpp
-	env CC=$(CXX) $(OCTMEX) "$<" -lsvm
-svm%_mex.$(MEX_EXT): svm%_mex.cpp
-	$(MATMEX) "$<" -lsvm
-%.$(MEX_EXT): %.cpp  
-	$(MATMEX) "$<" -lsvm
-
-endif
-
-
-ifeq (,$(wildcard /usr/include/linear.h))
-## liblinear-dev is not available
 train.$(MEX_EXT) predict.$(MEX_EXT): train.c tron.o linear.o linear_model_matlab.c
 	$(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -c linear_model_matlab.c
 	$(MATMEX)  -lblas train.c tron.o linear.o linear_model_matlab.o 
@@ -119,21 +102,10 @@
 train.mex predict.mex: train.c tron.o linear.o linear_model_matlab.c
 	env CC=$(CXX) $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.c
 linear.o: linear.cpp
-	echo "It's recommended to install the package liblinear-dev"
 	$(CXX) $(CFLAGS) -c linear.cpp
 tron.o: tron.cpp tron.h
 	$(CXX) $(CFLAGS) -c tron.cpp
 
-else
-## package liblinear-dev is installed
-train.$(MEX_EXT) predict.$(MEX_EXT): train.c
-	$(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -c linear_model_matlab.c
-	$(MATMEX)  -lblas -llinear train.c
-train.mex predict.mex: train.c
-	env CC=$(CXX) $(OCTMEX) -lblas -llinear  train.c
-
-endif
-
 %.oct: %.cc
 	mkoctfile$(OCTAVE_VERSION) "$<"