| Makefile.in (180746) | Makefile.in (180750) |
|---|---|
| 1# $Id: Makefile.in,v 1.289 2008/03/13 01:41:31 djm Exp $ | 1# $Id: Makefile.in,v 1.297 2008/07/08 14:21:12 djm Exp $ |
| 2 3# uncomment if you run a non bourne compatable shell. Ie. csh 4#SHELL = @SH@ 5 6AUTORECONF=autoreconf 7 8prefix=@prefix@ 9exec_prefix=@exec_prefix@ --- 52 unchanged lines hidden (view full) --- 62 63TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT) 64 65LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ 66 canohost.o channels.o cipher.o cipher-acss.o cipher-aes.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 \ 69 log.o match.o md-sha256.o moduli.o nchan.o packet.o \ | 2 3# uncomment if you run a non bourne compatable shell. Ie. csh 4#SHELL = @SH@ 5 6AUTORECONF=autoreconf 7 8prefix=@prefix@ 9exec_prefix=@exec_prefix@ --- 52 unchanged lines hidden (view full) --- 62 63TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT) 64 65LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ 66 canohost.o channels.o cipher.o cipher-acss.o cipher-aes.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 \ 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 \ 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 \ 74 entropy.o scard-opensc.o gss-genr.o umac.o 75 76SSHOBJS= ssh.o readconf.o clientloop.o sshtty.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 \ 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 75 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 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 \ 81 auth.o auth1.o auth2.o auth-options.o session.o \ 82 auth-chall.o auth2-chall.o groupaccess.o \ 83 auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ 84 auth2-none.o auth2-passwd.o auth2-pubkey.o \ 85 monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ 86 auth-krb5.o \ 87 auth2-gss.o gss-serv.o gss-serv-krb5.o \ 88 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ 89 audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o 90 | 78 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 \ 81 auth.o auth1.o auth2.o auth-options.o session.o \ 82 auth-chall.o auth2-chall.o groupaccess.o \ 83 auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ 84 auth2-none.o auth2-passwd.o auth2-pubkey.o \ 85 monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ 86 auth-krb5.o \ 87 auth2-gss.o gss-serv.o gss-serv-krb5.o \ 88 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ 89 audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o 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 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 | 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 = 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@ 94 95CONFIGFILES=sshd_config.out ssh_config.out moduli.out 96CONFIGFILES_IN=sshd_config ssh_config moduli 97 98PATHSUBS = \ 99 -e 's|/etc/ssh/ssh_prng_cmds|$(sysconfdir)/ssh_prng_cmds|g' \ 100 -e 's|/etc/ssh/ssh_config|$(sysconfdir)/ssh_config|g' \ 101 -e 's|/etc/ssh/ssh_known_hosts|$(sysconfdir)/ssh_known_hosts|g' \ 102 -e 's|/etc/ssh/sshd_config|$(sysconfdir)/sshd_config|g' \ 103 -e 's|/usr/libexec|$(libexecdir)|g' \ 104 -e 's|/etc/shosts.equiv|$(sysconfdir)/shosts.equiv|g' \ 105 -e 's|/etc/ssh/ssh_host_key|$(sysconfdir)/ssh_host_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' \ 108 -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \ | 93MANTYPE = @MANTYPE@ 94 95CONFIGFILES=sshd_config.out ssh_config.out moduli.out 96CONFIGFILES_IN=sshd_config ssh_config moduli 97 98PATHSUBS = \ 99 -e 's|/etc/ssh/ssh_prng_cmds|$(sysconfdir)/ssh_prng_cmds|g' \ 100 -e 's|/etc/ssh/ssh_config|$(sysconfdir)/ssh_config|g' \ 101 -e 's|/etc/ssh/ssh_known_hosts|$(sysconfdir)/ssh_known_hosts|g' \ 102 -e 's|/etc/ssh/sshd_config|$(sysconfdir)/sshd_config|g' \ 103 -e 's|/usr/libexec|$(libexecdir)|g' \ 104 -e 's|/etc/shosts.equiv|$(sysconfdir)/shosts.equiv|g' \ 105 -e 's|/etc/ssh/ssh_host_key|$(sysconfdir)/ssh_host_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' \ 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/sshrc|$(sysconfdir)/sshrc|g' \ 111 -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \ 112 -e 's|/var/empty|$(PRIVSEP_PATH)|g' \ 113 -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g' 114 115FIXPATHSCMD = $(SED) $(PATHSUBS) 116 --- 148 unchanged lines hidden (view full) --- 265 $(INSTALL) -m 0755 $(STRIP_OPT) sftp $(DESTDIR)$(bindir)/sftp 266 $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server $(DESTDIR)$(SFTP_SERVER) 267 $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 268 $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 269 $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 270 $(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-keyscan.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 | 110 -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \ 111 -e 's|/etc/ssh/sshrc|$(sysconfdir)/sshrc|g' \ 112 -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \ 113 -e 's|/var/empty|$(PRIVSEP_PATH)|g' \ 114 -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g' 115 116FIXPATHSCMD = $(SED) $(PATHSUBS) 117 --- 148 unchanged lines hidden (view full) --- 266 $(INSTALL) -m 0755 $(STRIP_OPT) sftp $(DESTDIR)$(bindir)/sftp 267 $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server $(DESTDIR)$(SFTP_SERVER) 268 $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 269 $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 270 $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 271 $(INSTALL) -m 644 ssh-agent.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1 272 $(INSTALL) -m 644 ssh-keygen.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.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 274 $(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 276 if [ ! -z "$(INSTALL_SSH_RAND_HELPER)" ]; then \ 277 $(INSTALL) -m 644 ssh-rand-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 ; \ 278 fi 279 $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 280 $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 --- 108 unchanged lines hidden (view full) --- 389 TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ 390 TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add"; \ 391 TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \ 392 TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \ 393 TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \ 394 TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ 395 TEST_SSH_PLINK="plink"; \ 396 TEST_SSH_PUTTYGEN="puttygen"; \ | 275 $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5 276 $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5 277 $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 278 if [ ! -z "$(INSTALL_SSH_RAND_HELPER)" ]; then \ 279 $(INSTALL) -m 644 ssh-rand-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 ; \ 280 fi 281 $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 282 $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 --- 108 unchanged lines hidden (view full) --- 391 TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ 392 TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add"; \ 393 TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \ 394 TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \ 395 TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \ 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@" ; \ |
|
| 397 cd $(srcdir)/regress || exit $$?; \ 398 $(MAKE) \ 399 .OBJDIR="$${BUILDDIR}/regress" \ 400 .CURDIR="`pwd`" \ 401 BUILDDIR="$${BUILDDIR}" \ 402 OBJ="$${BUILDDIR}/regress/" \ 403 PATH="$${BUILDDIR}:$${PATH}" \ 404 TEST_SHELL="$${TEST_SHELL}" \ 405 TEST_SSH_SSH="$${TEST_SSH_SSH}" \ 406 TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ 407 TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \ 408 TEST_SSH_SSHADD="$${TEST_SSH_SSHADD}" \ 409 TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \ 410 TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ 411 TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ 412 TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ 413 TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ 414 TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ | 401 cd $(srcdir)/regress || exit $$?; \ 402 $(MAKE) \ 403 .OBJDIR="$${BUILDDIR}/regress" \ 404 .CURDIR="`pwd`" \ 405 BUILDDIR="$${BUILDDIR}" \ 406 OBJ="$${BUILDDIR}/regress/" \ 407 PATH="$${BUILDDIR}:$${PATH}" \ 408 TEST_SHELL="$${TEST_SHELL}" \ 409 TEST_SSH_SSH="$${TEST_SSH_SSH}" \ 410 TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ 411 TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \ 412 TEST_SSH_SSHADD="$${TEST_SSH_SSHADD}" \ 413 TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \ 414 TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ 415 TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ 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@" \ |
|
| 415 EXEEXT="$(EXEEXT)" \ | 421 EXEEXT="$(EXEEXT)" \ |
| 416 $@ | 422 $@ && echo all tests passed |
| 417 418compat-tests: $(LIBCOMPAT) 419 (cd openbsd-compat/regress && $(MAKE)) 420 421regressclean: 422 if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \ 423 (cd regress && $(MAKE) clean) \ 424 fi --- 15 unchanged lines hidden --- | 423 424compat-tests: $(LIBCOMPAT) 425 (cd openbsd-compat/regress && $(MAKE)) 426 427regressclean: 428 if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \ 429 (cd regress && $(MAKE) clean) \ 430 fi --- 15 unchanged lines hidden --- |