[Pkg-wmaker-commits] [wmcube] 37/67: debian/patches: (update_makefile.patch) Separate OS from CFLAGS so user doesn't accidentally forget about it.

[Doug Torrance]

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

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

commit c2a4af1b1177deebaac0e5d5a4c9cae41adb2537
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Tue Jan 13 08:10:49 2015 -0600

    debian/patches: (update_makefile.patch) Separate OS from CFLAGS so user doesn't
    accidentally forget about it.
---
 debian/patches/update_makefile.patch | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/patches/update_makefile.patch b/debian/patches/update_makefile.patch
index fa8ac1c..a45ebed 100644
--- a/debian/patches/update_makefile.patch
+++ b/debian/patches/update_makefile.patch
@@ -1,6 +1,7 @@
 Description: Update Makefile.
  In particular,
  - Change doc installation directory to avoid FSSTND-dir-in-usr Lintian error.
+ - Separate OS from CFLAGS so user doesn't accidentally forget about it.
  - Honor CPPFLAGS and LDFLAGS build flags.
  - Honor DESTDIR variable.
  - Create binary installation directory.
@@ -14,7 +15,7 @@ Last-Update: 2015-01-13
 
 --- a/wmcube/Makefile
 +++ b/wmcube/Makefile
-@@ -7,7 +7,7 @@
+@@ -7,14 +7,14 @@
  
  PREFIX = /usr
  BINDIR = $(PREFIX)/bin
@@ -23,12 +24,20 @@ Last-Update: 2015-01-13
  OBJDIR = $(PREFIX)/share/wmcube
  
  # Edit OSLIBS as appropriate to include OS specific libraries.
+ 
+ OSLIBS =
+ LIBS   = -lXpm -lXext -lX11 -lm $(OSLIBS)
+-CFLAGS = -Wall -O2 $(OS)
++CFLAGS = -Wall -O2
+ 
+ OBJS =	wmcube.o \
+ 	../wmgeneral/wmgeneral.o \
 @@ -22,10 +22,10 @@
  	../wmgeneral/list.o
  
  .c.o:
 -	$(CC) $(CFLAGS) $(INCDIR) -c $< -o $*.o
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCDIR) -c $< -o $*.o
++	$(CC) $(OS) $(CPPFLAGS) $(CFLAGS) $(INCDIR) -c $< -o $*.o
  
  wmcube: $(OBJS)
 -	$(CC) -o wmcube $^ -lXext $(LIBDIR) $(LIBS)

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