summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2009-12-29 21:42:53 +0000
committerColin Watson <cjwatson@debian.org>2009-12-29 21:42:53 +0000
commit87552344215a38d3a2b0d4d63dc151e05978bbe1 (patch)
tree9f4b96055e6ccaa915e8d59d9f2805e9e119371d /Makefile.in
parenta25ec0b132c44c9e341e08464ff830de06b81126 (diff)
parentef94e5613d37bcbf880f21ee6094e4b1c7683a4c (diff)
import openssh-5.1p1-gsskex-cjwatson-20080722.patch
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in30
1 files changed, 20 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in
index 1e77a67b5..a81693d91 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.285 2007/06/11 04:01:42 djm Exp $ 1# $Id: Makefile.in,v 1.297 2008/07/08 14:21:12 djm Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -67,14 +67,14 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
67 cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ 67 cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
68 compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ 68 compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
69 log.o match.o md-sha256.o moduli.o nchan.o packet.o \ 69 log.o match.o md-sha256.o moduli.o nchan.o packet.o \
70 readpass.o rsa.o ttymodes.o xmalloc.o \ 70 readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \
71 atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ 71 atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
72 monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ 72 monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
73 kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ 73 kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \
74 entropy.o scard-opensc.o gss-genr.o umac.o kexgssc.o 74 entropy.o scard-opensc.o gss-genr.o umac.o kexgssc.o
75 75
76SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ 76SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
77 sshconnect.o sshconnect1.o sshconnect2.o 77 sshconnect.o sshconnect1.o sshconnect2.o mux.o
78 78
79SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ 79SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
80 sshpty.o sshlogin.o servconf.o serverloop.o \ 80 sshpty.o sshlogin.o servconf.o serverloop.o \
@@ -86,10 +86,10 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
86 auth-krb5.o \ 86 auth-krb5.o \
87 auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ 87 auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\
88 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ 88 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
89 audit.o audit-bsm.o platform.o 89 audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o
90 90
91MANPAGES = 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 91MANPAGES = moduli.5.out 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
92MANPAGES_IN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5 92MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5
93MANTYPE = @MANTYPE@ 93MANTYPE = @MANTYPE@
94 94
95CONFIGFILES=sshd_config.out ssh_config.out moduli.out 95CONFIGFILES=sshd_config.out ssh_config.out moduli.out
@@ -106,6 +106,7 @@ PATHSUBS = \
106 -e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \ 106 -e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \
107 -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \ 107 -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \
108 -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \ 108 -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
109 -e 's|/etc/moduli|$(sysconfdir)/moduli|g' \
109 -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \ 110 -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \
110 -e 's|/etc/ssh/sshrc|$(sysconfdir)/sshrc|g' \ 111 -e 's|/etc/ssh/sshrc|$(sysconfdir)/sshrc|g' \
111 -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \ 112 -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \
@@ -156,8 +157,8 @@ ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o
156ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o 157ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o
157 $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) 158 $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
158 159
159sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o 160sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o
160 $(LD) -o $@ sftp-server.o sftp-common.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 161 $(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
161 162
162sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o 163sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o
163 $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT) 164 $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT)
@@ -270,6 +271,7 @@ install-files: scard-install
270 $(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1 271 $(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1
271 $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 272 $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1
272 $(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 273 $(INSTALL) -m 644 ssh-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1
274 $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5
273 $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5 275 $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
274 $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5 276 $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
275 $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 277 $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
@@ -378,7 +380,7 @@ uninstall:
378 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 380 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
379 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 381 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
380 382
381tests: $(TARGETS) 383tests interop-tests: $(TARGETS)
382 BUILDDIR=`pwd`; \ 384 BUILDDIR=`pwd`; \
383 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ 385 [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
384 [ -f `pwd`/regress/Makefile ] || \ 386 [ -f `pwd`/regress/Makefile ] || \
@@ -392,6 +394,10 @@ tests: $(TARGETS)
392 TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \ 394 TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \
393 TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \ 395 TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \
394 TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ 396 TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \
397 TEST_SSH_PLINK="plink"; \
398 TEST_SSH_PUTTYGEN="puttygen"; \
399 TEST_SSH_CONCH="conch"; \
400 TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \
395 cd $(srcdir)/regress || exit $$?; \ 401 cd $(srcdir)/regress || exit $$?; \
396 $(MAKE) \ 402 $(MAKE) \
397 .OBJDIR="$${BUILDDIR}/regress" \ 403 .OBJDIR="$${BUILDDIR}/regress" \
@@ -408,8 +414,12 @@ tests: $(TARGETS)
408 TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ 414 TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \
409 TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ 415 TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \
410 TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ 416 TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
417 TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \
418 TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \
419 TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \
420 TEST_SSH_IPV6="@TEST_SSH_IPV6@" \
411 EXEEXT="$(EXEEXT)" \ 421 EXEEXT="$(EXEEXT)" \
412 $@ 422 $@ && echo all tests passed
413 423
414compat-tests: $(LIBCOMPAT) 424compat-tests: $(LIBCOMPAT)
415 (cd openbsd-compat/regress && $(MAKE)) 425 (cd openbsd-compat/regress && $(MAKE))