- Created contrib/ subdirectory. Included helpers from Phil Hands'

   Debian package, README file and chroot patch from Ricardo Cerqueira
   <rmcc@clix.pt>
 - Moved gnome-ssh-askpass.c to contrib directory and reomved config
   option.
 - Slight cleanup to doc files

1 files changed, 0 insertions, 13 deletions

diff --git a/Makefile.in b/Makefile.in
index b406d5f7a..a55af98db 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,7 +21,6 @@ ASKPASS_PROGRAM=$(ASKPASS_LOCATION)/ssh-askpass
 CC=@CC@
 PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\"
 CFLAGS=@CFLAGS@ $(PATHS) @DEFS@
-EXTRA_TARGETS=@GNOME_ASKPASS@
 LIBS=@LIBS@
 AR=@AR@
 RANLIB=@RANLIB@
@@ -29,9 +28,6 @@ INSTALL=@INSTALL@
 PERL=@PERL@
 LDFLAGS=-L. @LDFLAGS@
 
-GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui`
-GNOME_LIBS=`gnome-config --libs gnome gnomeui`
-
 TARGETS=ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS)
 
 LIBOBJS= atomicio.o authfd.o authfile.o bsd-bindresvport.o bsd-daemon.o bsd-misc.o bsd-mktemp.o bsd-rresvport.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o fake-getaddrinfo.o fake-getnameinfo.o fingerprint.o hostfile.o log.o match.o mpaux.o nchan.o packet.o radix.o random.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o xmalloc.o 
@@ -76,9 +72,6 @@ ssh-agent: libssh.a ssh-agent.o log-client.o
 ssh-keygen: libssh.a ssh-keygen.o log-client.o
         $(CC) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh $(LIBS) 
 
-gnome-ssh-askpass: gnome-ssh-askpass.c
-        $(CC) $(CFLAGS) $(GNOME_CFLAGS) -o $@ gnome-ssh-askpass.c $(GNOME_LIBS)
-
 $(MANPAGES) $(CONFIGFILES)::
         $(FIXPATHSCMD) $(srcdir)/$@
 
@@ -124,12 +117,6 @@ install: $(TARGETS)
         -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
         ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
 
-        if [ ! -z "@GNOME_ASKPASS@" ] ; then \
-                $(INSTALL) -d $(DESTDIR)$(libexecdir) ; \
-                $(INSTALL) -d $(DESTDIR)$(libexecdir)/ssh ; \
-                $(INSTALL) -s @GNOME_ASKPASS@ $(DESTDIR)${ASKPASS_LOCATION} ; \
-        fi
-
         if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config -a ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \
                 $(INSTALL) -d $(DESTDIR)$(sysconfdir); \
                 $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \