merge of OPENSSH_3_6_1P1_SIMON_20030411

[gssapi-openssh.git] / openssh / Makefile.in

diff --git a/openssh/Makefile.in b/openssh/Makefile.in
index d4637bf0cae0d806b487a2c0efd9d5921fadc2a8..9f722a2b3ae4aa91e2ac9717a567973c6583b5b3 100644 (file)
--- a/openssh/Makefile.in
+++ b/openssh/Makefile.in
@@ -68,8 +68,7 @@ LIBSSH_OBJS=authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o \
        key.o dispatch.o kex.o mac.o uuencode.o misc.o \
        rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o kexgex.o \
        kexdhc.o kexgexc.o scard.o msg.o progressmeter.o \
-       kexgss.o kexgssc.o gss-genr.o \
-       entropy.o
+       entropy.o kexgssc.o gss-genr.o
 
 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
        sshconnect.o sshconnect1.o sshconnect2.o
@@ -81,9 +80,9 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
        auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
        auth2-none.o auth2-passwd.o auth2-pubkey.o \
        monitor_mm.o monitor.o monitor_wrap.o monitor_fdpass.o \
-       kexdhs.o kexgexs.o \
-       auth-krb5.o auth-krb4.o \
-       kexgsss.o auth2-gss.o gss-serv.o \
+       kexdhs.o kexgexs.o kexgsss.o \
+       auth-krb5.o auth-krb4.o auth2-gss.o \
+       gss-serv.o gss-serv-krb5.o gss-serv-gsi.o \
        loginrec.o auth-pam.o auth2-pam.o auth-sia.o md5crypt.o
 
 MANPAGES       = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out