[Pkg-wmaker-commits] [wmtime] 04/101: wmtime - Fix compiler and linker flags in Makefile.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmtime.

commit 029e3da71951f511df14dd523c07d767273bfa55
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Sun Sep 22 09:49:01 2013 -0500

    wmtime - Fix compiler and linker flags in Makefile.
    
    The Makefile of wmtime had to be patched in order for CFLAGS
    not to be redefined by the Makefile but to use the CFLAGS
    passed by debhelper and add additional flags through
    string concatenation. LDFLAGS and CPPFLAGS weren't passed
    at all and have been added to the linker command line.
    
    Patch by John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>,
    from Debian package.
---
 wmtime/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wmtime/Makefile b/wmtime/Makefile
index 26b8571..a1c3c58 100755
--- a/wmtime/Makefile
+++ b/wmtime/Makefile
@@ -7,13 +7,13 @@ OBJS =	wmtime.o \
 XPMS = wmtime-master.xpm wmtime-mask.xbm
 
 CC = gcc
-CFLAGS = -O2
+CFLAGS += -O2
 
 .c.o:
-	$(CC) $(CFLAGS) -c -Wall $< -o $*.o
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c -Wall $< -o $*.o
 
 wmtime: $(OBJS) $(XPMS)
-	$(CC) $(CFLAGS) -o wmtime $(OBJS) $(LIBDIR) $(LIBS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wmtime $(OBJS) $(LIBDIR) $(LIBS)
 
 clean::
 	for i in $(OBJS) ; do \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmtime.git