[liblinear] 07/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 7ba884a8edc11adff57c97b1ba15ce882570b474
Merge: 41a5c7a 24894ac
Author: Christian Kastner <debian at kvr.at>
Date:   Fri Jun 29 16:37:43 2012 +0200

    Merge branch 'upstream' into dfsg
    
    Conflicts:
    	Makefile
    	matlab/Makefile
    	windows/liblinear.dll
    	windows/libsvmread.mexw64
    	windows/libsvmwrite.mexw64
    	windows/predict.exe
    	windows/predict.mexw64
    	windows/train.exe
    	windows/train.mexw64

 COPYRIGHT                    |   2 +-
 Makefile                     |  10 +-
 README                       | 128 ++++---
 linear.cpp                   | 789 +++++++++++++++++++++++++++++++++----------
 linear.h                     |  13 +-
 matlab/Makefile              |  10 +-
 matlab/README                |  80 +++--
 matlab/libsvmread.c          |   2 +
 matlab/libsvmwrite.c         |   2 +
 matlab/linear_model_matlab.c |  16 +-
 matlab/make.m                |  29 +-
 matlab/predict.c             |  89 +++--
 matlab/train.c               | 110 ++++--
 predict.c                    |  39 ++-
 python/Makefile              |   2 +-
 python/README                |  35 +-
 python/liblinear.py          |  32 +-
 python/liblinearutil.py      |  83 +++--
 train.c                      | 105 ++++--
 tron.cpp                     |   6 +-
 20 files changed, 1149 insertions(+), 433 deletions(-)

diff --cc Makefile
index 503a760,7a74e26..d700802
--- a/Makefile
+++ b/Makefile
@@@ -1,18 -1,25 +1,24 @@@
  CXX ?= g++
  CC ?= gcc
  CFLAGS = -Wall -Wconversion -O3 -fPIC
 -LIBS = blas/blas.a
 +LIBS =
  SHVER = 1
+ OS = $(shell uname)
 -#LIBS = -lblas
  
  all: train predict
  
 -lib: linear.o tron.o blas/blas.a
 +lib: linear.o tron.o
- 	$(CXX) -shared -dynamiclib linear.o tron.o -o liblinear.so.$(SHVER)
+ 	if [ "$(OS)" = "Darwin" ]; then \
+ 		SHARED_LIB_FLAG="-dynamiclib -Wl,-install_name,liblinear.so.$(SHVER)"; \
+ 	else \
+ 		SHARED_LIB_FLAG="-shared -Wl,-soname,liblinear.so.$(SHVER)"; \
+ 	fi; \
 -	$(CXX) $${SHARED_LIB_FLAG} linear.o tron.o blas/blas.a -o liblinear.so.$(SHVER)
++	$(CXX) $${SHARED_LIB_FLAG} 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
@@@ -21,7 -28,10 +27,7 @@@
  linear.o: linear.cpp linear.h
  	$(CXX) $(CFLAGS) -c -o linear.o linear.cpp
  
 -blas/blas.a: blas/*.c blas/*.h
 -	make -C blas OPTFLAGS='$(CFLAGS)' CC='$(CC)';
  
  clean:
- 	cd matlab;	make clean
 -	make -C blas clean
+ 	make -C matlab clean
  	rm -f *~ tron.o linear.o train predict liblinear.so.$(SHVER)
diff --cc matlab/Makefile
index 3fed00f,f05fab4..05f67ac
--- a/matlab/Makefile
+++ b/matlab/Makefile
@@@ -44,11 -44,15 +44,11 @@@ libsvmwrite.$(MEX_EXT):	libsvmwrite.
  linear_model_matlab.o: linear_model_matlab.c ../linear.h
  	$(CXX) $(CFLAGS) -c linear_model_matlab.c
  
- ../linear.o:
- 	cd ..; make linear.o
+ ../linear.o: ../linear.cpp ../linear.h
+ 	make -C .. linear.o
  
- ../tron.o: 
- 	cd ..; make tron.o
+ ../tron.o: ../tron.cpp ../tron.h 
+ 	make -C .. tron.o
  
 -../blas/blas.a: ../blas/*.c ../blas/*.h
 -	make -C ../blas OPTFLAGS='$(CFLAGS)' CC='$(CC)';
 -
  clean:
- 	rm -f *~ *.o *.mex* *.obj
 -	make -C ../blas clean
+ 	rm -f *~ *.o *.mex* *.obj ../linear.o ../tron.o

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