summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-09-30 10:40:39 +1000
committerDamien Miller <djm@mindrot.org>2002-09-30 10:40:39 +1000
commit50f6123eefd6a76dbbd6c5353f8c0bb22ff9a5a2 (patch)
tree918d8be8e24bc6deedd46d8707f2b0e10556bfd7
parentcd501ec30b448cb6fda4fb517fa94b69cb97652a (diff)
- (djm) Tidy contrib/, add Makefile for GNOME passphrase dialogs, tweak README
-rw-r--r--ChangeLog5
-rw-r--r--contrib/Makefile20
-rw-r--r--contrib/README4
3 files changed, 26 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2da8c824..efb44797 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20020930
+ - (djm) Tidy contrib/, add Makefile for GNOME passphrase dialogs, tweak README
+
20020927
- (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2002/09/25 11:17:16
@@ -734,4 +737,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2485 2002/09/27 03:25:58 djm Exp $
+$Id: ChangeLog,v 1.2486 2002/09/30 00:40:39 djm Exp $
diff --git a/contrib/Makefile b/contrib/Makefile
new file mode 100644
index 00000000..9bdb95ff
--- /dev/null
+++ b/contrib/Makefile
@@ -0,0 +1,20 @@
+all:
+ @echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2"
+
+gnome-ssh-askpass2: gnome-ssh-askpass2.c
+ $(CC) `pkg-config --cflags gtk+-2.0` \
+ gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
+ `pkg-config --libs gtk+-2.0`
+
+gnome-ssh-askpass1: gnome-ssh-askpass1.c
+ $(CC) `gnome-config --cflags gnome gnomeui` \
+ gnome-ssh-askpass1.c -o gnome-ssh-askpass1 \
+ `gnome-config --libs gnome gnomeui`
+
+gnome-ssh-askpass2: gnome-ssh-askpass2.c
+ $(CC) `pkg-config --cflags gtk+-2.0` \
+ gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
+ `pkg-config --libs gtk+-2.0`
+
+clean:
+ rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass
diff --git a/contrib/README b/contrib/README
index 407152dc..67dbbd27 100644
--- a/contrib/README
+++ b/contrib/README
@@ -32,8 +32,8 @@ your public key to a remote machine's ~/.ssh/authorized_keys file.
gnome-ssh-askpass[12]:
-A GNOME and Gtk2 passphrase requesters. Compilation instructions
-are in the top of the files.
+A GNOME and Gtk2 passphrase requesters. Use "make gnome-ssh-askpass1" or
+"make gnome-ssh-askpass2" to build.
sshd.pam.generic: