[liblinear] 12/123: Linking in Makefile patch was broken; fixes added

[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 b65a8fa6d14f535bbd69a380c07cf86aabb28cfd
Author: Christian Kastner <debian at kvr.at>
Date:   Thu Jun 17 16:20:48 2010 +0200

    Linking in Makefile patch was broken; fixes added
---
 ...operly-build-shared-and-static-libraries-programs.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 f5e4c69..7f8a930 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
@@ -9,7 +9,7 @@ link upstream's programs to the shared libraries.
  1 files changed, 32 insertions(+), 14 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 8e4cb10..c6df256 100644
+index 8e4cb10..66a0a3f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,23 +1,41 @@
@@ -19,19 +19,19 @@ index 8e4cb10..c6df256 100644
 -LIBS =
 -#LIBS = -lblas
 +CFLAGS +=
-+LDFLAGS +=
++LDFLAGS += -L.
 +LIBS +=
  
 -all: train predict
 +LIB_CFLAGS += $(CFLAGS) -fPIC
-+LIB_LDFLAGS += $(LDFLAGS) -L.
-+LIB_LIBS += $(LIBS) -llinear
++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)
 +PROG_CFLAGS += $(CFLAGS)
-+PROG_LDFLAGS += $(LDFLAGS) -L.
-+PROG_LIBS += $(LIBS) -lblas -llinear
++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)
@@ -55,7 +55,7 @@ index 8e4cb10..c6df256 100644
 +$(LIBFILE): linear.cpp linear.h tron.cpp tron.h
 +	$(CXX) $(LIB_CFLAGS) $(LIB_LDFLAGS) -shared \
 +		-Wl,-soname,liblinear.so.$(LVER) \
-+		-o $@ linear.cpp tron.cpp $(LIBS)
++		-o $@ linear.cpp tron.cpp $(LIB_LIBS)
 +	ln -s $@ liblinear.so.$(LVER)
 +	ln -s liblinear.so.$(LVER) liblinear.so
 +

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