[Pkg-wmaker-commits] [wmbatppc] 22/35: debian/patches: (fix_build_flags.patch) Respect CFLAGS, CPPFLAGS, and LDFLAGS.

[Doug Torrance]

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

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

commit 4b4f15bcf617080c4f8df60706ca83c7cdd6ec15
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Wed Dec 31 08:17:52 2014 -0600

    debian/patches: (fix_build_flags.patch) Respect CFLAGS, CPPFLAGS, and LDFLAGS.
---
 debian/patches/fix_build_flags.patch | 36 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 2 files changed, 37 insertions(+)

diff --git a/debian/patches/fix_build_flags.patch b/debian/patches/fix_build_flags.patch
new file mode 100644
index 0000000..be9fb2d
--- /dev/null
+++ b/debian/patches/fix_build_flags.patch
@@ -0,0 +1,36 @@
+Description: Fix build flags.
+ In particular,
+ - Respect CFLAGS, CPPFLAGS, and LDFLAGS.
+ - Separate FLAGS into CFLAGS and XOSDFLAGS.
+ - Move -Wall to CFLAGS.
+ - Remove redundant -lXext.
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Last-Update: 2014-12-31
+
+--- a/Makefile
++++ b/Makefile
+@@ -5,19 +5,20 @@
+ CC = /usr/bin/gcc
+ INSTALL = /usr/bin/install
+ LIBS = -lXpm -lXext -lX11 -lm $(shell /usr/bin/xosd-config --libs)
+-FLAGS = -O2 -DENABLE_XOSD $(shell /usr/bin/xosd-config --cflags)
++CFLAGS = -O2 -Wall
++XOSDFLAGS = -DENABLE_XOSD $(shell /usr/bin/xosd-config --cflags)
+ OBJS = wmgeneral.o
+ 
+ default:all
+ 
+ .c.o:
+-	$(CC) $(FLAGS) -c -Wall $< -o $*.o
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
+ 
+ wmbatppc.o: wmbatppc.c wmbatppc-master.xpm
+-	$(CC) $(FLAGS) -c -Wall wmbatppc.c -o $*.o
++	$(CC) $(XOSDFLAGS) $(CPPFLAGS) $(CFLAGS) -c wmbatppc.c -o $*.o
+ 
+ wmbatppc: $(OBJS) wmbatppc.o
+-	$(CC) $(FLAGS) -o wmbatppc wmbatppc.o $(OBJS) -lXext $(LIBS)
++	$(CC) $(LDFLAGS) -o wmbatppc wmbatppc.o $(OBJS) $(LIBS)
+ 
+ all:: wmbatppc
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0d320cb..c63ae98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_link_order.patch
 remove_X11R6_dir.patch
+fix_build_flags.patch

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