[liblinear] 05/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 f27a3f9e29a29855c7b35e4ca558f80f1c2d2598
Merge: 1c197a1 84bbe0f
Author: Christian Kastner <debian at kvr.at>
Date:   Wed Apr 6 21:53:04 2011 +0200

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

 COPYRIGHT                                  |   2 +-
 linear.cpp                                 | 352 ++++++++++++++++++-----------
 matlab/Makefile                            |  16 +-
 matlab/README                              |  43 ++--
 matlab/libsvmread.c                        |  14 +-
 matlab/train.c                             |   8 +-
 predict.c                                  |   7 +-
 python/README                              |  22 +-
 python/{linear.py => liblinear.py}         |  11 +-
 python/{linearutil.py => liblinearutil.py} |   7 +-
 train.c                                    |   9 +-
 11 files changed, 298 insertions(+), 193 deletions(-)

diff --cc matlab/Makefile
index ac8b0d0,0a6df1f..3fed00f
--- a/matlab/Makefile
+++ b/matlab/Makefile
@@@ -29,11 -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
- 	$(MEX) $(MEX_OPTION) train.c tron.o linear.o linear_model_matlab.o
 -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
++	$(MEX) $(MEX_OPTION) train.c ../tron.o ../linear.o linear_model_matlab.o
  
- predict.$(MEX_EXT): predict.c ../linear.h tron.o linear.o linear_model_matlab.o
- 	$(MEX) $(MEX_OPTION) predict.c tron.o linear.o linear_model_matlab.o
 -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
++	$(MEX) $(MEX_OPTION) predict.c ../tron.o ../linear.o linear_model_matlab.o
  
  libsvmread.$(MEX_EXT):	libsvmread.c
  	$(MEX) $(MEX_OPTION) libsvmread.c
@@@ -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: ../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 ../linear.o ../tron.o
 +	rm -f *~ *.o *.mex* *.obj

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