[liblinear] 79/123: Refresh patch 0001-*

[Christian Kastner]

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

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

commit b138383a436073b88d301b408ead8ed345103024
Author: Christian Kastner <debian at kvr.at>
Date:   Wed Apr 6 23:58:35 2011 +0200

    Refresh patch 0001-*
    
    The patch now applies both to the Makefile in git, and the Makefile from
    get-orig-source
---
 ...uild-shared-and-static-libraries-programs.patch | 54 ++++++++++++----------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/debian/patches/0001-Properly-build-shared-and-static-libraries-programs.patch b/debian/patches/0001-Properly-build-shared-and-static-libraries-programs.patch
index 195808d..a903149 100644
--- a/debian/patches/0001-Properly-build-shared-and-static-libraries-programs.patch
+++ b/debian/patches/0001-Properly-build-shared-and-static-libraries-programs.patch
@@ -11,48 +11,53 @@ Last-Update: 2010-07-09
  Makefile |   50 ++++++++++++++++++++++++++++++++------------------
  1 files changed, 32 insertions(+), 18 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index 5004ff9..8ad5303 100644
---- a/Makefile
-+++ b/Makefile
+Index: liblinear-1.8.orig/Makefile
+===================================================================
+--- liblinear-1.8.orig.orig/Makefile	2011-04-05 14:14:49.000000000 +0200
++++ liblinear-1.8.orig/Makefile	2011-04-05 14:23:19.804010092 +0200
 @@ -1,27 +1,41 @@
--CXX ?= g++
-+XX ?= g++
+ CXX ?= g++
  CC ?= gcc
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
 -LIBS =
 -SHVER = 1
--#LIBS = -lblas
+-
+-all: train predict
+-
+-lib: linear.o tron.o
+-	$(CXX) -shared -dynamiclib linear.o tron.o -o liblinear.so.$(SHVER)
+-
+-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
+-	$(CXX) $(CFLAGS) -o predict predict.c tron.o linear.o $(LIBS)
+-
+-tron.o: tron.cpp tron.h
+-	$(CXX) $(CFLAGS) -c -o tron.o tron.cpp
+-
+-linear.o: linear.cpp linear.h
+-	$(CXX) $(CFLAGS) -c -o linear.o linear.cpp
+-
 +CFLAGS +=
 +LDFLAGS += -L.
 +LIBS +=
- 
--all: train predict
++
 +LIB_CFLAGS += $(CFLAGS) -fPIC
 +LIB_LDFLAGS += $(LDFLAGS)
 +LIB_LIBS += $(LIBS) -lblas
- 
--lib: linear.o tron.o
--	$(CXX) -shared -dynamiclib linear.o tron.o -o liblinear.so.$(SHVER)
++
 +PROG_CFLAGS += $(CFLAGS)
 +PROG_LDFLAGS += $(LDFLAGS)
 +PROG_LIBS += $(LIBS) -llinear
- 
--train: tron.o linear.o train.c
--	$(CXX) $(CFLAGS) -o train train.c tron.o linear.o $(LIBS)
++
 +LVER ?= 0
 +LSUBVER ?= 0
 +LIBFILE = liblinear.so.$(LVER).$(LSUBVER)
- 
--predict: tron.o linear.o predict.c
--	$(CXX) $(CFLAGS) -o predict predict.c tron.o linear.o $(LIBS)
- 
--tron.o: tron.cpp tron.h
--	$(CXX) $(CFLAGS) -c -o tron.o tron.cpp
++
++
 +all: liblinear-train liblinear-predict liblinear.a
- 
--linear.o: linear.cpp linear.h
--	$(CXX) $(CFLAGS) -c -o linear.o linear.cpp
++
 +liblinear-train: train.c $(LIBFILE)
 +	$(CXX) $(PROG_CFLAGS) $(PROG_LDFLAGS) -o $@ train.c $(PROG_LIBS)
 +
@@ -75,4 +80,3 @@ index 5004ff9..8ad5303 100644
 -	cd matlab;	make clean
 -	rm -f *~ tron.o linear.o train predict liblinear.so.$(SHVER)
 +	rm -f *~ *.o *.a *.so* liblinear-train liblinear-predict
--- 

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