[liblinear] 03/08: Merge branch 'upstream' into dfsg

[Christian Kastner]

This is an automated email from the git hooks/post-receive script.

chrisk-guest pushed a commit to branch dfsg
in repository liblinear.

commit 4e213a86ba6a2f4b8a8417e3a4d3aec100419887
Merge: c54223d 6a690d4
Author: Christian Kastner <debian at kvr.at>
Date:   Fri Jul 9 00:13:05 2010 +0200

    Merge branch 'upstream' into dfsg
    
    Conflicts:
    	Makefile
    	windows/libsvmread.mexw32
    	windows/libsvmwrite.mexw32
    	windows/predict.exe
    	windows/predict.mexw32
    	windows/train.exe
    	windows/train.mexw32

 COPYRIGHT            |   2 +-
 Makefile             |   6 +-
 Makefile.win         |   9 +-
 README               |  28 +++--
 linear.cpp           | 310 +++++++++++++++++++++++++----------------------
 linear.def           |  18 +++
 linear.h             |   7 +-
 matlab/predict.c     |   6 +-
 matlab/train.c       |  18 ++-
 predict.c            |   4 +-
 python/Makefile      |   4 +
 python/README        | 334 +++++++++++++++++++++++++++++++++++++++++++++++++++
 python/linear.py     | 252 ++++++++++++++++++++++++++++++++++++++
 python/linearutil.py | 209 ++++++++++++++++++++++++++++++++
 train.c              |  15 ++-
 15 files changed, 1042 insertions(+), 180 deletions(-)

diff --cc Makefile
index 8e4cb10,faec9a0..5004ff9
--- a/Makefile
+++ b/Makefile
@@@ -1,15 -1,19 +1,19 @@@
  CXX ?= g++
  CC ?= gcc
  CFLAGS = -Wall -Wconversion -O3 -fPIC
 -LIBS = blas/blas.a
 +LIBS =
+ SHVER = 1
  #LIBS = -lblas
  
  all: train predict
  
 -lib: linear.o tron.o blas/blas.a
 -	$(CXX) -shared -dynamiclib linear.o tron.o blas/blas.a -o liblinear.so.$(SHVER)
++lib: linear.o tron.o
++	$(CXX) -shared -dynamiclib linear.o tron.o -o liblinear.so.$(SHVER)
+ 
 -train: tron.o linear.o train.c blas/blas.a
 +train: tron.o linear.o train.c
  	$(CXX) $(CFLAGS) -o train train.c tron.o linear.o $(LIBS)
  
 -predict: tron.o linear.o predict.c blas/blas.a
 +predict: tron.o linear.o predict.c
  	$(CXX) $(CFLAGS) -o predict predict.c tron.o linear.o $(LIBS)
  
  tron.o: tron.cpp tron.h
@@@ -18,6 -22,10 +22,6 @@@
  linear.o: linear.cpp linear.h
  	$(CXX) $(CFLAGS) -c -o linear.o linear.cpp
  
 -blas/blas.a:
 -	cd blas; make OPTFLAGS='$(CFLAGS)' CC='$(CC)';
 -
  clean:
 -	cd blas;	make clean
  	cd matlab;	make clean
- 	rm -f *~ tron.o linear.o train predict
+ 	rm -f *~ tron.o linear.o train predict liblinear.so.$(SHVER)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/liblinear.git