[Pkg-wmaker-commits] [wmshutdown] 26/173: debian/patches/10-makefile.dpatch: refresh

[Doug Torrance]

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

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

commit 12a3c841648bfba32d8a5046482629a68dc30a91
Author: Jari Aalto <jari.aalto at cante.net>
Date:   Sat Dec 5 17:32:00 2009 +0200

    debian/patches/10-makefile.dpatch: refresh
---
 debian/patches/10-makefile.dpatch | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/debian/patches/10-makefile.dpatch b/debian/patches/10-makefile.dpatch
index c9f7487..fc9ce51 100755
--- a/debian/patches/10-makefile.dpatch
+++ b/debian/patches/10-makefile.dpatch
@@ -2,21 +2,34 @@
 ## /tmp/makefile.patch.dpatch by  <jari.aalto at cante.net>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: 
+## DP: e
 ## DP: Author: Jari Aalto <jari.aalto at cante.net>
 ## DP: 
 ## DP: 
-## DP:     Makefile: change name. Use pkg-onfig
+## DP:     Makefile: chnage name. Fix linking
 ## DP:     
 ## DP:     Signed-off-by: Jari Aalto <jari.aalto at cante.net>
 
 @DPATCH@
 
 diff --git a/Makefile b/Makefile
-index 219e871..7eb6a75 100644
+index 219e871..9d9d765 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -8,22 +8,19 @@ clean:
+@@ -1,4 +1,11 @@
+-all:
++
++LDFLAGS  = -Wl,--no-add-needed
++INCFLAGS = -I/usr/include/gtk-2.0
++LIBS	 = -lX11
++
++all: dock shutdown
++
++help:
+ 	@echo "wmShutdown version 0.1 - Rafael V. Aroca <rafael at linuxqos.cjb.net>"
+ 	@echo "Order of makes to install: dock, shutdown, install"
+ 
+@@ -8,22 +15,19 @@ clean:
  	rm -f Shutdown
  
  install:
@@ -41,9 +54,9 @@ index 219e871..7eb6a75 100644
  dock: wmShutdown.c
 -	$(CC) -c -o wmShutdown.o wmShutdown.c `gtk-config --cflags` 
 -	$(CC) -o wmShutdown wmShutdown.o `gtk-config --libs` 
-+	$(CC) -c -o wmShutdown.o wmShutdown.c `pkg-config --cflags`
-+	$(CC) -o wmShutdown wmShutdown.o `pkg-config --libs`
++	$(CC) $(INCFLAGS) -c -o wmShutdown.o wmShutdown.c `pkg-config --cflags gtk+-2.0`
++	$(CC) $(LDFLAGS) -o wmShutdown wmShutdown.o `pkg-config --libs gtk+-2.0` $(LIBS)
  
  shutdown: shutdown.c
 -	$(CC) -o Shutdown shutdown.c 
-+	$(CC) -o Shutdown shutdown.c
++	$(CC) $(LDFLAGS) $(INCFLAGS) -o Shutdown shutdown.c

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