[SCM] m2vrequantiser/master: debian/patches/1001-makefile.patch

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7a6eeec36c3d547aa40fde93ac621ca182cc7706
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jul 11 15:46:32 2014 +0100

    debian/patches/1001-makefile.patch
    
    - Don't append -g -02 to CFLAGS by default, let the build takes it on
      its own.
    - Process CPPFLAGS when compiling for hardening.

diff --git a/debian/patches/1001-makefile.patch b/debian/patches/1001-makefile.patch
index 25f5332..027b2de 100644
--- a/debian/patches/1001-makefile.patch
+++ b/debian/patches/1001-makefile.patch
@@ -2,13 +2,25 @@ Description: Handle DESTDIR variable to properly install stuff.
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: no
 ---
- Makefile |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ Makefile |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
---- M2VRequantiser-v1.1.orig/Makefile
-+++ M2VRequantiser-v1.1/Makefile
-@@ -17,11 +17,11 @@ M2VRequantiser : $(OBJECTS)
- 	$(CC) $(CFLAGS) -c $<
+--- m2vrequantiser.orig/Makefile
++++ m2vrequantiser/Makefile
+@@ -1,6 +1,6 @@
+ PREFIX    ?= /usr/local
+ CC         = gcc
+-CFLAGS    ?= -O2 -g -funroll-loops -frename-registers
++CFLAGS    += -funroll-loops -frename-registers
+ CFLAGS    += -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_REENTRANT
+ CFLAGS    += -Wall
+ OBJECTS    = main.o
+@@ -14,14 +14,14 @@ M2VRequantiser : $(OBJECTS)
+ 	$(CC) $(CFLAGS) $(OBJECTS) $(LDFLAGS) $(LOADLIBES) -o M2VRequantiser
+ 
+ %.o : %.c
+-	$(CC) $(CFLAGS) -c $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
  
  install:	all
 -	$(INSTALL) -d $(PREFIX)/bin

-- 
m2vrequantiser packaging