[liblinear] 108/123: Correct use of CPPFLAGS

[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 d9436c6cdd4e1a86c3c574c11ac60a6da62f9a31
Author: Christian Kastner <debian at kvr.at>
Date:   Fri Feb 21 16:56:34 2014 +0100

    Correct use of CPPFLAGS
---
 ...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 cafe456..321d273 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
@@ -12,7 +12,7 @@ Last-Update: 2011-04-11
  1 file changed, 30 insertions(+), 16 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 503a760..a2082d5 100644
+index 503a760..a06bde4 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,27 +1,41 @@
@@ -21,7 +21,7 @@ index 503a760..a2082d5 100644
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
 -LIBS =
 -SHVER = 1
-+CFLAGS += $(CPPFLAGS)
++CFLAGS +=
 +LDFLAGS += -L.
 +LIBS +=
  
@@ -52,21 +52,21 @@ index 503a760..a2082d5 100644
 -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)
++	$(CXX) $(CPPFLAGS) $(PROG_CFLAGS) $(PROG_LDFLAGS) -o $@ train.c $(PROG_LIBS)
  
 +liblinear-predict: predict.c $(LIBFILE)
-+	$(CXX) $(PROG_CFLAGS) $(PROG_LDFLAGS) -o $@ predict.c $(PROG_LIBS)
++	$(CXX) $(CPPFLAGS) $(PROG_CFLAGS) $(PROG_LDFLAGS) -o $@ predict.c $(PROG_LIBS)
 +
 +$(LIBFILE): linear.cpp linear.h tron.cpp tron.h
-+	$(CXX) $(LIB_CFLAGS) $(LIB_LDFLAGS) -shared \
++	$(CXX) $(CPPFLAGS) $(LIB_CFLAGS) $(LIB_LDFLAGS) -shared \
 +		-Wl,-soname,liblinear.so.$(LVER) \
 +		-o $@ linear.cpp tron.cpp $(LIB_LIBS)
 +	ln -s $@ liblinear.so.$(LVER)
 +	ln -s liblinear.so.$(LVER) liblinear.so
 +
 +liblinear.a:
-+	$(CXX) $(CFLAGS) $(LDFLAGS) -c -o linear-static.o linear.cpp
-+	$(CXX) $(CFLAGS) $(LDFLAGS) -c -o tron-static.o tron.cpp
++	$(CXX) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c -o linear-static.o linear.cpp
++	$(CXX) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c -o tron-static.o tron.cpp
 +	ar cru liblinear.a linear-static.o tron-static.o
  
  clean:

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