← Back to branch summary

~ubuntu-branches/ubuntu/saucy/wmshutdown/saucy

« back to all changes in this revision

Viewing changes to debian/patches/10-makefile.patch

  • Committer: Package Import Robot
  • Author(s): Jari Aalto
  • Date: 2012-03-24 02:47:56 UTC
  • mfrom: (2.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20120324024756-4riggsr96aj1utmj
Tags: 0.2-9
* debian/copyright
  - Update to format 1.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/10-makefile.patch
3
3
Date: Thu, 17 Dec 2009 14:20:10 +0200
4
4
Subject: [PATCH] Makefile: Change name. Fix linking with GTK+
5
5
 
 
6
Also use CFLAGS, CPPFLAGS, LDFLAGS from the environment. Necessary to use
 
7
(hardening) compiler flags specified by dh.
 
8
 
6
9
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
7
10
---
8
11
 Makefile |   32 ++++++++++++++++++++------------
15
18
@@ -1,4 +1,15 @@
16
19
-all:
17
20
+
18
 
+LDFLAGS  = -Wl,--no-add-needed -Wl,--no-undefined
 
21
+LDFLAGS += -Wl,--no-add-needed -Wl,--no-undefined
19
22
+INCFLAGS = -I/usr/include/gtk-2.0
20
23
+LIBS    = -lX11
21
24
+
54
57
 dock: wmShutdown.c
55
58
-       $(CC) -c -o wmShutdown.o wmShutdown.c `gtk-config --cflags` 
56
59
-       $(CC) -o wmShutdown wmShutdown.o `gtk-config --libs` 
57
 
+       $(CC) $(INCFLAGS) $(GTKFLAGS) -c -o wmShutdown.o wmShutdown.c
 
60
+       $(CC) $(CFLAGS) $(CPPFLAGS) $(INCFLAGS) $(GTKFLAGS) -c -o wmShutdown.o wmShutdown.c
58
61
+       $(CC) $(LDFLAGS) -o wmShutdown wmShutdown.o $(GTKLIBS) $(LIBS)
59
62
 
60
63
 shutdown: shutdown.c
61
64
-       $(CC) -o Shutdown shutdown.c 
62
 
+       $(CC) $(LDFLAGS) $(INCFLAGS) -o Shutdown shutdown.c
 
65
+       $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INCFLAGS) -o Shutdown shutdown.c
63
66
-- 
64
67
1.6.5
65
68