diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 51 |
1 files changed, 33 insertions, 18 deletions
diff --git a/Makefile.in b/Makefile.in index 35f3e5e35..f51b86a27 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.310 2010/05/12 06:51:39 dtucker Exp $ | 1 | # $Id: Makefile.in,v 1.320 2011/01/17 10:15:29 dtucker 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@ |
@@ -60,6 +60,7 @@ ENT=@ENT@ | |||
60 | XAUTH_PATH=@XAUTH_PATH@ | 60 | XAUTH_PATH=@XAUTH_PATH@ |
61 | LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ | 61 | LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ |
62 | EXEEXT=@EXEEXT@ | 62 | EXEEXT=@EXEEXT@ |
63 | MANFMT=@MANFMT@ | ||
63 | 64 | ||
64 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ | 65 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ |
65 | INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ | 66 | INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ |
@@ -73,26 +74,27 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ | |||
73 | log.o match.o md-sha256.o moduli.o nchan.o packet.o \ | 74 | log.o match.o md-sha256.o moduli.o nchan.o packet.o \ |
74 | readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \ | 75 | readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \ |
75 | atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ | 76 | atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ |
76 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ | 77 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ |
77 | kexgex.o kexdhc.o kexgexc.o msg.o progressmeter.o dns.o \ | 78 | kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ |
78 | entropy.o gss-genr.o umac.o jpake.o schnorr.o \ | 79 | msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o jpake.o \ |
79 | ssh-pkcs11.o kexgssc.o | 80 | schnorr.o kexgssc.o ssh-pkcs11.o |
80 | 81 | ||
81 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ | 82 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ |
82 | sshconnect.o sshconnect1.o sshconnect2.o mux.o \ | 83 | sshconnect.o sshconnect1.o sshconnect2.o mux.o \ |
83 | roaming_common.o roaming_client.o | 84 | roaming_common.o roaming_client.o |
84 | 85 | ||
85 | SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | 86 | SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ |
87 | audit.o audit-bsm.o audit-linux.o platform.o \ | ||
86 | sshpty.o sshlogin.o servconf.o serverloop.o \ | 88 | sshpty.o sshlogin.o servconf.o serverloop.o \ |
87 | auth.o auth1.o auth2.o auth-options.o session.o \ | 89 | auth.o auth1.o auth2.o auth-options.o session.o \ |
88 | auth-chall.o auth2-chall.o groupaccess.o \ | 90 | auth-chall.o auth2-chall.o groupaccess.o \ |
89 | auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ | 91 | auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ |
90 | auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ | 92 | auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ |
91 | monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ | 93 | monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o \ |
92 | auth-krb5.o \ | 94 | auth-krb5.o \ |
93 | auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ | 95 | auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ |
94 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ | 96 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ |
95 | audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \ | 97 | sftp-server.o sftp-common.o \ |
96 | roaming_common.o roaming_serv.o | 98 | roaming_common.o roaming_serv.o |
97 | 99 | ||
98 | MANPAGES = 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 ssh-pkcs11-helper.8.out ssh-vulnkey.1.out sshd_config.5.out ssh_config.5.out | 100 | MANPAGES = 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 ssh-pkcs11-helper.8.out ssh-vulnkey.1.out sshd_config.5.out ssh_config.5.out |
@@ -110,6 +112,7 @@ PATHSUBS = \ | |||
110 | -e 's|/usr/libexec|$(libexecdir)|g' \ | 112 | -e 's|/usr/libexec|$(libexecdir)|g' \ |
111 | -e 's|/etc/shosts.equiv|$(sysconfdir)/shosts.equiv|g' \ | 113 | -e 's|/etc/shosts.equiv|$(sysconfdir)/shosts.equiv|g' \ |
112 | -e 's|/etc/ssh/ssh_host_key|$(sysconfdir)/ssh_host_key|g' \ | 114 | -e 's|/etc/ssh/ssh_host_key|$(sysconfdir)/ssh_host_key|g' \ |
115 | -e 's|/etc/ssh/ssh_host_ecdsa_key|$(sysconfdir)/ssh_host_ecdsa_key|g' \ | ||
113 | -e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \ | 116 | -e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \ |
114 | -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \ | 117 | -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \ |
115 | -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \ | 118 | -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \ |
@@ -235,7 +238,7 @@ catman-do: | |||
235 | @for f in $(MANPAGES_IN) ; do \ | 238 | @for f in $(MANPAGES_IN) ; do \ |
236 | base=`echo $$f | sed 's/\..*$$//'` ; \ | 239 | base=`echo $$f | sed 's/\..*$$//'` ; \ |
237 | echo "$$f -> $$base.0" ; \ | 240 | echo "$$f -> $$base.0" ; \ |
238 | nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \ | 241 | $(MANFMT) $$f | cat -v | sed -e 's/.\^H//g' \ |
239 | >$$base.0 ; \ | 242 | >$$base.0 ; \ |
240 | done | 243 | done |
241 | 244 | ||
@@ -332,20 +335,27 @@ install-sysconf: | |||
332 | 335 | ||
333 | host-key: ssh-keygen$(EXEEXT) | 336 | host-key: ssh-keygen$(EXEEXT) |
334 | @if [ -z "$(DESTDIR)" ] ; then \ | 337 | @if [ -z "$(DESTDIR)" ] ; then \ |
335 | if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \ | 338 | if [ -f "$(sysconfdir)/ssh_host_key" ] ; then \ |
336 | echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \ | 339 | echo "$(sysconfdir)/ssh_host_key already exists, skipping." ; \ |
337 | else \ | 340 | else \ |
338 | ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" ; \ | 341 | ./ssh-keygen -t rsa1 -f $(sysconfdir)/ssh_host_key -N "" ; \ |
339 | fi ; \ | 342 | fi ; \ |
340 | if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key ] ; then \ | 343 | if [ -f $(sysconfdir)/ssh_host_dsa_key ] ; then \ |
341 | echo "$(DESTDIR)$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \ | 344 | echo "$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \ |
342 | else \ | 345 | else \ |
343 | ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" ; \ | 346 | ./ssh-keygen -t dsa -f $(sysconfdir)/ssh_host_dsa_key -N "" ; \ |
344 | fi ; \ | 347 | fi ; \ |
345 | if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key ] ; then \ | 348 | if [ -f $(sysconfdir)/ssh_host_rsa_key ] ; then \ |
346 | echo "$(DESTDIR)$(sysconfdir)/ssh_host_rsa_key already exists, skipping." ; \ | 349 | echo "$(sysconfdir)/ssh_host_rsa_key already exists, skipping." ; \ |
347 | else \ | 350 | else \ |
348 | ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" ; \ | 351 | ./ssh-keygen -t rsa -f $(sysconfdir)/ssh_host_rsa_key -N "" ; \ |
352 | fi ; \ | ||
353 | if [ -z "@COMMENT_OUT_ECC@" ] ; then \ | ||
354 | if [ -f $(sysconfdir)/ssh_host_ecdsa_key ] ; then \ | ||
355 | echo "$(sysconfdir)/ssh_host_ecdsa_key already exists, skipping." ; \ | ||
356 | else \ | ||
357 | ./ssh-keygen -t ecdsa -f $(sysconfdir)/ssh_host_ecdsa_key -N "" ; \ | ||
358 | fi ; \ | ||
349 | fi ; \ | 359 | fi ; \ |
350 | fi ; | 360 | fi ; |
351 | 361 | ||
@@ -353,6 +363,7 @@ host-key-force: ssh-keygen$(EXEEXT) | |||
353 | ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" | 363 | ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" |
354 | ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" | 364 | ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" |
355 | ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" | 365 | ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" |
366 | test -z "@COMMENT_OUT_ECC@" && ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N "" | ||
356 | 367 | ||
357 | uninstallall: uninstall | 368 | uninstallall: uninstall |
358 | -rm -f $(DESTDIR)$(sysconfdir)/ssh_config | 369 | -rm -f $(DESTDIR)$(sysconfdir)/ssh_config |
@@ -415,6 +426,8 @@ tests interop-tests: $(TARGETS) | |||
415 | TEST_SSH_PUTTYGEN="puttygen"; \ | 426 | TEST_SSH_PUTTYGEN="puttygen"; \ |
416 | TEST_SSH_CONCH="conch"; \ | 427 | TEST_SSH_CONCH="conch"; \ |
417 | TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ | 428 | TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ |
429 | TEST_SSH_ECC="@TEST_SSH_ECC@" ; \ | ||
430 | TEST_SSH_SHA256="@TEST_SSH_SHA256@" ; \ | ||
418 | cd $(srcdir)/regress || exit $$?; \ | 431 | cd $(srcdir)/regress || exit $$?; \ |
419 | $(MAKE) \ | 432 | $(MAKE) \ |
420 | .OBJDIR="$${BUILDDIR}/regress" \ | 433 | .OBJDIR="$${BUILDDIR}/regress" \ |
@@ -435,7 +448,9 @@ tests interop-tests: $(TARGETS) | |||
435 | TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ | 448 | TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ |
436 | TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ | 449 | TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ |
437 | TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \ | 450 | TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \ |
438 | TEST_SSH_IPV6="@TEST_SSH_IPV6@" \ | 451 | TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ |
452 | TEST_SSH_ECC="$${TEST_SSH_ECC}" \ | ||
453 | TEST_SSH_SHA256="$${TEST_SSH_SHA256}" \ | ||
439 | EXEEXT="$(EXEEXT)" \ | 454 | EXEEXT="$(EXEEXT)" \ |
440 | $@ && echo all tests passed | 455 | $@ && echo all tests passed |
441 | 456 | ||