[libocas] 42/60: 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 libocas.

commit eaf332800888faa8ebec22029c1a7ce7663c44b5
Author: Christian Kastner <debian at kvr.at>
Date:   Fri Feb 21 17:30:23 2014 +0100

    Correct use of CPPFLAGS
---
 ...uild-shared-and-static-libraries-programs.patch | 42 +++++++++++-----------
 1 file changed, 21 insertions(+), 21 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 41f0709..93e09cb 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,21 +1,21 @@
 From: Christian Kastner <debian at kvr.at>
 Date: Thu, 17 Jun 2010 15:39:15 +0200
-Subject: [PATCH] Properly build shared and static libraries, programs
+Subject: Properly build shared and static libraries, programs
 
 Modify upstream's Makefile to properly build shared and static libraries, and
 link upstream's programs to the shared libraries.
 
 Forwarded: no
-Last-Update: 2012-06-30
+Last-Update: 2014-02-21
 ---
- Makefile |   48 +++++++++++++++++++++++++++++++++++-------------
- 1 files changed, 35 insertions(+), 13 deletions(-)
+ Makefile | 48 +++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 35 insertions(+), 13 deletions(-)
 
-Index: libocas-0.93/Makefile
-===================================================================
---- libocas-0.93.orig/Makefile	2010-06-11 23:06:27.000000000 +0200
-+++ libocas-0.93/Makefile	2012-06-30 15:59:10.191870897 +0200
-@@ -3,10 +3,23 @@
+diff --git a/Makefile b/Makefile
+index 2ed4145..9bd3a9c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,10 +3,23 @@ MEX := mex
  MEXFLAGS := $(shell if uname -m | grep -q x86_64 ; then echo -largeArrayDims ; fi)
  MEXSUFFIX := $(shell if uname -m | grep -q x86_64 ; then echo mexa64 ; else echo mexglx ; fi)
  CC := gcc
@@ -24,7 +24,7 @@ Index: libocas-0.93/Makefile
 -#CFLAGS := -lm -msse -O3 -fPIC -fstrict-aliasing -fomit-frame-pointer -Wall
 -#CFLAGS := -lm -msse -O3 -fPIC -fopenmp -fstrict-aliasing -fomit-frame-pointer -Wall
 +
-+CFLAGS += $(CPPFLAGS)
++CFLAGS +=
 +LDFLAGS +=
 +LIBS += -lm
 +
@@ -43,7 +43,7 @@ Index: libocas-0.93/Makefile
  
  
  ifeq (yes,$(MEXDETECTED))
-@@ -43,21 +56,30 @@
+@@ -43,21 +56,30 @@ lbpfilter.$(MEXSUFFIX): lbpfilter_mex.c
  
  
  else 
@@ -54,30 +54,30 @@ Index: libocas-0.93/Makefile
 -svmocas:	svmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c ocas_helper.h libocas.h sparse_mat.h libocas.c
 -		$(CC) $(CFLAGS) -o $@ svmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c libocas.c libqp_splx.c
 +svmocas:	svmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c ocas_helper.h libocas.h sparse_mat.h $(LIBFILE)
-+		$(CC) $(PROG_CFLAGS) $(PROG_LDFLAGS) -o $@ svmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c $(PROG_LIBS)
++		$(CC) $(CPPFLAGS) $(PROG_CFLAGS) $(PROG_LDFLAGS) -o $@ svmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c $(PROG_LIBS)
  
 -msvmocas:	msvmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c ocas_helper.h libocas.h sparse_mat.h libocas.c
 -		$(CC) $(CFLAGS) -o $@ msvmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c libocas.c libqp_splx.c
 +msvmocas:	msvmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c ocas_helper.h libocas.h sparse_mat.h $(LIBFILE)
-+		$(CC) $(PROG_CFLAGS) $(PROG_LDFLAGS) -o $@ msvmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c $(PROG_LIBS)
++		$(CC) $(CPPFLAGS) $(PROG_CFLAGS) $(PROG_LDFLAGS) -o $@ msvmocas.c lib_svmlight_format.c sparse_mat.c ocas_helper.c $(PROG_LIBS)
  
  linclass:	linclass.c lib_svmlight_format.c libocas.h 
 -		$(CC) $(CFLAGS) -o $@ linclass.c lib_svmlight_format.c  
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ linclass.c lib_svmlight_format.c $(LIBS)
- 
++		$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ linclass.c lib_svmlight_format.c $(LIBS)
++
  
--libocas.so:	libocas.c libocas.h libqp_splx.c libqp.h 
--		$(CC) $(CFLAGS) -shared -o $@ libocas.c libqp_splx.c
 +$(LIBFILE):	libocas.c libocas.h libqp_splx.c libqp.h
-+		$(CC) $(LIB_CFLAGS) $(LIB_LDFLAGS) -shared \
++		$(CC) $(CPPFLAGS) $(LIB_CFLAGS) $(LIB_LDFLAGS) -shared \
 +			-Wl,-soname,libocas.so.$(LVER) \
 +			-o $@ libocas.c libqp_splx.c $(LIB_LIBS)
 +		ln -s $@ libocas.so.$(LVER)
 +		ln -s libocas.so.$(LVER) libocas.so
-+
+ 
+-libocas.so:	libocas.c libocas.h libqp_splx.c libqp.h 
+-		$(CC) $(CFLAGS) -shared -o $@ libocas.c libqp_splx.c
 +libocas.a:
-+	$(CXX) $(CFLAGS) $(LDFLAGS) -c -o libocas-static.o libocas.c
-+	$(CXX) $(CFLAGS) $(LDFLAGS) -c -o libqp_splx-static.o libqp_splx.c
++	$(CXX) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c -o libocas-static.o libocas.c
++	$(CXX) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c -o libqp_splx-static.o libqp_splx.c
 +	ar cru libocas.a libocas-static.o libqp_splx-static.o
  
  clean: 

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