[liblinear] 28/123: Refresh Makefile patch

[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 ed8ac3cf1bb08140a315e9d901b4407a0b8b4715
Author: Christian Kastner <debian at kvr.at>
Date:   Fri Jul 9 18:11:28 2010 +0200

    Refresh Makefile patch
---
 ...uild-shared-and-static-libraries-programs.patch | 34 ++++++++++++----------
 1 file changed, 19 insertions(+), 15 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 933558f..4d2d796 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
@@ -1,25 +1,27 @@
 From: Christian Kastner <debian at kvr.at>
-Date: Thu, 17 Jun 2010 15:57:19 +0200
+Date: Fri, 9 Jul 2010 18:09:09 +0200
 Subject: [PATCH] Properly build shared and static libraries, programs
 
 Modify upstream's Makefile to properly build shared and static libraries,
 link upstream's programs to the shared libraries.
 
 Forwarded: no
-Last-Update: 2010-06-17
+Last-Update: 2010-07-09
 ---
- Makefile |   46 ++++++++++++++++++++++++++++++++--------------
- 1 files changed, 32 insertions(+), 14 deletions(-)
+ Makefile |   50 ++++++++++++++++++++++++++++++++------------------
+ 1 files changed, 32 insertions(+), 18 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 8e4cb10..66a0a3f 100644
+index 5004ff9..7044220 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1,23 +1,41 @@
- CXX ?= g++
+@@ -1,27 +1,41 @@
+-CXX ?= g++
++XX ?= g++
  CC ?= gcc
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
 -LIBS =
+-SHVER = 1
 -#LIBS = -lblas
 +CFLAGS +=
 +LDFLAGS += -L.
@@ -30,25 +32,27 @@ index 8e4cb10..66a0a3f 100644
 +LIB_LDFLAGS += $(LDFLAGS)
 +LIB_LIBS += $(LIBS) -lblas
  
--train: tron.o linear.o train.c
--	$(CXX) $(CFLAGS) -o train train.c tron.o linear.o $(LIBS)
+-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
  
--predict: tron.o linear.o predict.c
--	$(CXX) $(CFLAGS) -o predict predict.c tron.o linear.o $(LIBS)
+-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: linear-train linear-predict liblinear.a
  
 -linear.o: linear.cpp linear.h
 -	$(CXX) $(CFLAGS) -c -o linear.o linear.cpp
-+all: linear-train linear-predict liblinear.a
-+
 +linear-train: train.c $(LIBFILE)
 +	$(CXX) $(PROG_CFLAGS) $(PROG_LDFLAGS) -o $@ train.c $(PROG_LIBS)
 +
@@ -57,7 +61,7 @@ index 8e4cb10..66a0a3f 100644
 +
 +$(LIBFILE): linear.cpp linear.h tron.cpp tron.h
 +	$(CXX) $(LIB_CFLAGS) $(LIB_LDFLAGS) -shared \
-+		-Wl,-soname,liblinear.so.$(LVER) \
++		Wl,-soname,liblinear.so.$(LVER) \
 +		-o $@ linear.cpp tron.cpp $(LIB_LIBS)
 +	ln -s $@ liblinear.so.$(LVER)
 +	ln -s liblinear.so.$(LVER) liblinear.so
@@ -69,6 +73,6 @@ index 8e4cb10..66a0a3f 100644
  
  clean:
 -	cd matlab;	make clean
--	rm -f *~ tron.o linear.o train predict
+-	rm -f *~ tron.o linear.o train predict liblinear.so.$(SHVER)
 +	rm -f *~ *.o *.so* linear-train linear-predict
 -- 

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