[Pkg-wmaker-commits] [wmgtemp] 28/45: debian/patches/update_makefile.patch: Honor *FLAGS variables during build.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Tue Aug 25 02:58:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmgtemp.
commit a071824fabbc9489475464fef11e46ca3db62f09
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Sat Jan 31 02:09:58 2015 -0600
debian/patches/update_makefile.patch: Honor *FLAGS variables during build.
---
debian/patches/update_makefile.patch | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/debian/patches/update_makefile.patch b/debian/patches/update_makefile.patch
index 0247c80..254ea8a 100644
--- a/debian/patches/update_makefile.patch
+++ b/debian/patches/update_makefile.patch
@@ -1,13 +1,39 @@
Description: Update manpage.
In particular,
+ - Split LDFLAGS into LDFLAGS and LIBS.
- Create binary installation directory.
- - Honor DESTDIR variable.
+ - Honor CPPFLAGS and DESTDIR variables.
+ - Rename CCFLAGS to standard CFLAGS.
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Last-Update: 2015-01-31
--- a/src/Makefile
+++ b/src/Makefile
-@@ -21,7 +21,8 @@
+@@ -1,9 +1,10 @@
+ CC = gcc
+ INSTALL = /usr/bin/install
+ LIB = lib
+-LDFLAGS = -L/usr/X11R6/$(LIB) -lXpm -lXext -lX11 -lsensors
++LDFLAGS = -L/usr/X11R6/$(LIB)
++LIBS = -lXpm -lXext -lX11 -lsensors
+ BINARY = wmgtemp
+-CCFLAGS = -Wall -g
++CFLAGS = -Wall -g
+ INSTDIR = /usr/local/bin
+
+ OFILES = wmgtemp.o \
+@@ -12,16 +13,17 @@
+ ./wmgeneral/list.o
+
+ %.o:
+- $(CC) $(CCFLAGS) -c $*.c -o $*.o
++ $(CC) $(CPPFLAGS) $(CFLAGS) -c $*.c -o $*.o
+
+ $(BINARY): $(OFILES)
+- $(CC) $(OFILES) $(LDFLAGS) -o $(BINARY)
++ $(CC) $(OFILES) $(LDFLAGS) -o $(BINARY) $(LIBS)
+
+ clean:
@ $(RM) $(OFILES) *~ "#"* $(BINARY)
install::
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmgtemp.git
More information about the Pkg-wmaker-commits
mailing list