diff options
author | Colin Watson <cjwatson@debian.org> | 2005-01-04 13:07:27 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-01-04 13:07:27 +0000 |
commit | fd0f611b70a83d80fe8793af785542ee5541b7cd (patch) | |
tree | bededd22bb7eeec52e20083237ab7e4113445a16 /Makefile.in | |
parent | c44fe9a5b9d3db96a7249b04d915f17e4a3a3b04 (diff) | |
parent | ebd2ce335af5861020c79fddb1ae35c03bf036cf (diff) |
Merge 3.9p1 to the trunk.
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in index 8bff3cb2d..ea0f9c3ef 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.257 2004/02/18 03:35:11 djm Exp $ | 1 | # $Id: Makefile.in,v 1.263 2004/08/15 11:01:37 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@ |
@@ -67,22 +67,21 @@ LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o buffer.o \ | |||
67 | compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ | 67 | compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ |
68 | log.o match.o moduli.o mpaux.o nchan.o packet.o \ | 68 | log.o match.o moduli.o mpaux.o nchan.o packet.o \ |
69 | readpass.o rsa.o tildexpand.o ttymodes.o xmalloc.o \ | 69 | readpass.o rsa.o tildexpand.o ttymodes.o xmalloc.o \ |
70 | atomicio.o key.o dispatch.o kex.o mac.o uuencode.o misc.o \ | 70 | atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ |
71 | rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o kexgex.o \ | 71 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ |
72 | kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ | 72 | kexgex.o kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ |
73 | entropy.o scard-opensc.o gss-genr.o | 73 | entropy.o scard-opensc.o gss-genr.o |
74 | 74 | ||
75 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ | 75 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ |
76 | sshconnect.o sshconnect1.o sshconnect2.o | 76 | sshconnect.o sshconnect1.o sshconnect2.o |
77 | 77 | ||
78 | SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | 78 | SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ |
79 | sshpty.o sshlogin.o servconf.o serverloop.o uidswap.o \ | 79 | sshpty.o sshlogin.o servconf.o serverloop.o \ |
80 | auth.o auth1.o auth2.o auth-options.o session.o \ | 80 | auth.o auth1.o auth2.o auth-options.o session.o \ |
81 | auth-chall.o auth2-chall.o groupaccess.o \ | 81 | auth-chall.o auth2-chall.o groupaccess.o \ |
82 | auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ | 82 | auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \ |
83 | auth2-none.o auth2-passwd.o auth2-pubkey.o \ | 83 | auth2-none.o auth2-passwd.o auth2-pubkey.o \ |
84 | monitor_mm.o monitor.o monitor_wrap.o monitor_fdpass.o \ | 84 | monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \ |
85 | kexdhs.o kexgexs.o \ | ||
86 | auth-krb5.o \ | 85 | auth-krb5.o \ |
87 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ | 86 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ |
88 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o | 87 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o |
@@ -200,11 +199,14 @@ clean: regressclean | |||
200 | 199 | ||
201 | distclean: regressclean | 200 | distclean: regressclean |
202 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 201 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
203 | rm -f *.out core | 202 | rm -f *.out core opensshd.init |
204 | rm -f Makefile config.h config.status ssh_prng_cmds *~ | 203 | rm -f Makefile buildpkg.sh config.h config.status ssh_prng_cmds *~ |
205 | rm -rf autom4te.cache | 204 | rm -rf autom4te.cache |
206 | (cd openbsd-compat && $(MAKE) distclean) | 205 | (cd openbsd-compat && $(MAKE) distclean) |
207 | (cd scard && $(MAKE) distclean) | 206 | (cd scard && $(MAKE) distclean) |
207 | if test -d pkg ; then \ | ||
208 | rm -fr pkg ; \ | ||
209 | fi | ||
208 | 210 | ||
209 | veryclean: distclean | 211 | veryclean: distclean |
210 | rm -f configure config.h.in *.0 | 212 | rm -f configure config.h.in *.0 |
@@ -375,7 +377,7 @@ tests: $(TARGETS) | |||
375 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ | 377 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ |
376 | [ -f `pwd`/regress/Makefile ] || \ | 378 | [ -f `pwd`/regress/Makefile ] || \ |
377 | ln -s $(srcdir)/regress/Makefile `pwd`/regress/Makefile ; \ | 379 | ln -s $(srcdir)/regress/Makefile `pwd`/regress/Makefile ; \ |
378 | TEST_SHELL="@TEST_MINUS_S_SH@"; \ | 380 | TEST_SHELL="@TEST_SHELL@"; \ |
379 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ | 381 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ |
380 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ | 382 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ |
381 | TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ | 383 | TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ |
@@ -407,3 +409,9 @@ regressclean: | |||
407 | if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \ | 409 | if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \ |
408 | (cd regress && $(MAKE) clean) \ | 410 | (cd regress && $(MAKE) clean) \ |
409 | fi | 411 | fi |
412 | |||
413 | package: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) | ||
414 | if [ "@MAKE_PACKAGE_SUPPORTED@" = yes ]; then \ | ||
415 | sh buildpkg.sh; \ | ||
416 | fi | ||
417 | |||