[Pkg-wmaker-commits] [wmget] 17/41: debian/patches: (01_Makefile.patch) Tidy up build flags and fix linking order.

[Doug Torrance]

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

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

commit e2989615a1b96c39840ad68edb3ea18ba92af87e
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Sun Jan 25 06:14:08 2015 -0600

    debian/patches: (01_Makefile.patch) Tidy up build flags and fix linking order.
---
 debian/patches/01_Makefile.patch | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/debian/patches/01_Makefile.patch b/debian/patches/01_Makefile.patch
index 7972dbd..99bdcfd 100644
--- a/debian/patches/01_Makefile.patch
+++ b/debian/patches/01_Makefile.patch
@@ -1,9 +1,27 @@
-Description: Install Makefile in /usr/share/man instead of /usr/man.
-Last-Update: 2015-01-24
+Description: Update Makefile.
+ In particular,
+ - Install Makefile in /usr/share/man instead of /usr/man. (This was the only
+   purpose of the dpatch version of this patch that existed prior to version
+   0.6.0-4.)
+ - Introduce LIBS variable to fix linking order and avoid "undefined reference"
+   errors during build.
+ - Remove unnecessary inclusion of CFLAGS during linking.
+Author: Doug Torrance <dtorrance at monmouthcollege.edu>
+Last-Update: 2015-01-25
 
 --- a/Makefile
 +++ b/Makefile
-@@ -83,8 +83,8 @@
+@@ -54,7 +54,8 @@
+ CFLAGS=		-Wall -W -I/usr/X11R6/include -O
+ # The following line is what I use during development
+ #CFLAGS:=	$(CFLAGS) -Werror -g 
+-LDFLAGS=	-L/usr/X11R6/lib -lXpm -lXext -lX11 -lm -lcurl
++LDFLAGS=	-L/usr/X11R6/lib
++LIBS=		-lXpm -lXext -lX11 -lm -lcurl
+ DOCS=		wmget.1
+ 
+ VERSION:=	$(shell grep '\#define WMGET_VERSION ' wmget.h \
+@@ -83,15 +84,15 @@
  		echo $(PREFIX) > install.prefix ; \
  		$(INSTALLDIR) $(PREFIX)/bin ; \
  		$(INSTALLBIN) wmget $(PREFIX)/bin/wmget ; \
@@ -14,3 +32,11 @@ Last-Update: 2015-01-24
  
  uninstall:
  		cd `cat install.prefix` && rm -f bin/wmget man/man1/wmget.1
+ 		rm -f install.prefix
+ 
+ wmget:		dockapplib $(OBJS)
+-		$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(DALIB) -o $@
++		$(CC) $(LDFLAGS) $(OBJS) $(DALIB) -o $@ $(LIBS)
+ 
+ 
+ ##### LIBRARY ##########################################################

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