diff options
author | Colin Watson <cjwatson@debian.org> | 2012-04-02 11:19:33 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-04-02 11:19:33 +0100 |
commit | 6f6ea15b1e8db08a4008abff64a287ee5ac327a8 (patch) | |
tree | a02908efad33d197d6140d0b0e549cf5cd914a7c /contrib/Makefile | |
parent | b4fcc0dd1f8ca61369332f4b9e8f1a718ea3e277 (diff) |
* Fix cross-building:
- Allow using a cross-architecture pkg-config.
- Pass default LDFLAGS to contrib/Makefile.
- Allow dh_strip to strip gnome-ssh-askpass, rather than calling
'install -s'.
Diffstat (limited to 'contrib/Makefile')
-rw-r--r-- | contrib/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/Makefile b/contrib/Makefile index 8b34eb221..c6c48e78a 100644 --- a/contrib/Makefile +++ b/contrib/Makefile | |||
@@ -1,3 +1,5 @@ | |||
1 | PKG_CONFIG = pkg-config | ||
2 | |||
1 | all: | 3 | all: |
2 | @echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2" | 4 | @echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2" |
3 | 5 | ||
@@ -7,9 +9,9 @@ gnome-ssh-askpass1: gnome-ssh-askpass1.c | |||
7 | `gnome-config --libs gnome gnomeui` | 9 | `gnome-config --libs gnome gnomeui` |
8 | 10 | ||
9 | gnome-ssh-askpass2: gnome-ssh-askpass2.c | 11 | gnome-ssh-askpass2: gnome-ssh-askpass2.c |
10 | $(CC) `pkg-config --cflags gtk+-2.0` \ | 12 | $(CC) `$(PKG_CONFIG) --cflags gtk+-2.0` \ |
11 | gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \ | 13 | gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \ |
12 | `pkg-config --libs gtk+-2.0 x11` | 14 | `$(PKG_CONFIG) --libs gtk+-2.0 x11` |
13 | 15 | ||
14 | clean: | 16 | clean: |
15 | rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass | 17 | rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass |