diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 85 |
1 files changed, 62 insertions, 23 deletions
diff --git a/Makefile.in b/Makefile.in index 39bbf344d..8a8774461 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.228.2.1 2003/04/29 09:12:08 djm Exp $ | 1 | # $Id: Makefile.in,v 1.249 2003/09/14 01:40:36 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@ |
@@ -46,6 +46,7 @@ LIBS=@LIBS@ | |||
46 | LIBPAM=@LIBPAM@ | 46 | LIBPAM=@LIBPAM@ |
47 | LIBWRAP=@LIBWRAP@ | 47 | LIBWRAP=@LIBWRAP@ |
48 | AR=@AR@ | 48 | AR=@AR@ |
49 | AWK=@AWK@ | ||
49 | RANLIB=@RANLIB@ | 50 | RANLIB=@RANLIB@ |
50 | INSTALL=@INSTALL@ | 51 | INSTALL=@INSTALL@ |
51 | PERL=@PERL@ | 52 | PERL=@PERL@ |
@@ -61,13 +62,14 @@ INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ | |||
61 | TARGETS=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) | 62 | TARGETS=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) |
62 | 63 | ||
63 | LIBSSH_OBJS=authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o \ | 64 | LIBSSH_OBJS=authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o \ |
64 | cipher.o compat.o compress.o crc32.o deattack.o fatal.o \ | 65 | cipher.o cipher-aes.o cipher-bf1.o cipher-ctr.o cipher-3des1.o \ |
65 | hostfile.o log.o match.o mpaux.o nchan.o packet.o radix.o readpass.o \ | 66 | compat.o compress.o crc32.o deattack.o fatal.o \ |
66 | rsa.o tildexpand.o ttymodes.o xmalloc.o atomicio.o \ | 67 | hostfile.o log.o match.o moduli.o mpaux.o nchan.o packet.o \ |
68 | readpass.o rsa.o tildexpand.o ttymodes.o xmalloc.o atomicio.o \ | ||
67 | key.o dispatch.o kex.o mac.o uuencode.o misc.o \ | 69 | key.o dispatch.o kex.o mac.o uuencode.o misc.o \ |
68 | rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o kexgex.o \ | 70 | rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o kexgex.o \ |
69 | kexdhc.o kexgexc.o scard.o msg.o progressmeter.o \ | 71 | kexdhc.o kexgexc.o scard.o msg.o progressmeter.o dns.o \ |
70 | entropy.o | 72 | entropy.o scard-opensc.o gss-genr.o |
71 | 73 | ||
72 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ | 74 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ |
73 | sshconnect.o sshconnect1.o sshconnect2.o | 75 | sshconnect.o sshconnect1.o sshconnect2.o |
@@ -80,8 +82,9 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | |||
80 | auth2-none.o auth2-passwd.o auth2-pubkey.o \ | 82 | auth2-none.o auth2-passwd.o auth2-pubkey.o \ |
81 | monitor_mm.o monitor.o monitor_wrap.o monitor_fdpass.o \ | 83 | monitor_mm.o monitor.o monitor_wrap.o monitor_fdpass.o \ |
82 | kexdhs.o kexgexs.o \ | 84 | kexdhs.o kexgexs.o \ |
83 | auth-krb5.o auth-krb4.o \ | 85 | auth-krb5.o \ |
84 | loginrec.o auth-pam.o auth2-pam.o auth-sia.o md5crypt.o | 86 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ |
87 | loginrec.o auth-pam.o auth-sia.o md5crypt.o | ||
85 | 88 | ||
86 | 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 | 89 | 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 |
87 | MANPAGES_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 | 90 | MANPAGES_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 |
@@ -109,11 +112,11 @@ PATHSUBS = \ | |||
109 | 112 | ||
110 | FIXPATHSCMD = $(SED) $(PATHSUBS) | 113 | FIXPATHSCMD = $(SED) $(PATHSUBS) |
111 | 114 | ||
112 | all: $(CONFIGFILES) $(MANPAGES) $(TARGETS) | 115 | all: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) |
113 | 116 | ||
114 | $(LIBSSH_OBJS): config.h | 117 | $(LIBSSH_OBJS): Makefile.in config.h |
115 | $(SSHOBJS): config.h | 118 | $(SSHOBJS): Makefile.in config.h |
116 | $(SSHDOBJS): config.h | 119 | $(SSHDOBJS): Makefile.in config.h |
117 | 120 | ||
118 | .c.o: | 121 | .c.o: |
119 | $(CC) $(CFLAGS) $(CPPFLAGS) -c $< | 122 | $(CC) $(CFLAGS) $(CPPFLAGS) -c $< |
@@ -171,7 +174,7 @@ $(MANPAGES): $(MANPAGES_IN) | |||
171 | manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \ | 174 | manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \ |
172 | fi; \ | 175 | fi; \ |
173 | if test "$(MANTYPE)" = "man"; then \ | 176 | if test "$(MANTYPE)" = "man"; then \ |
174 | $(FIXPATHSCMD) $${manpage} | $(PERL) $(srcdir)/mdoc2man.pl > $@; \ | 177 | $(FIXPATHSCMD) $${manpage} | $(AWK) -f $(srcdir)/mdoc2man.awk > $@; \ |
175 | else \ | 178 | else \ |
176 | $(FIXPATHSCMD) $${manpage} > $@; \ | 179 | $(FIXPATHSCMD) $${manpage} > $@; \ |
177 | fi | 180 | fi |
@@ -180,10 +183,20 @@ $(CONFIGFILES): $(CONFIGFILES_IN) | |||
180 | conffile=`echo $@ | sed 's/.out$$//'`; \ | 183 | conffile=`echo $@ | sed 's/.out$$//'`; \ |
181 | $(FIXPATHSCMD) $(srcdir)/$${conffile} > $@ | 184 | $(FIXPATHSCMD) $(srcdir)/$${conffile} > $@ |
182 | 185 | ||
186 | ssh_prng_cmds.out: ssh_prng_cmds | ||
187 | if test ! -z "$(INSTALL_SSH_PRNG_CMDS)"; then \ | ||
188 | $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ | ||
189 | fi | ||
190 | |||
191 | # fake rule to stop make trying to compile moduli.o into a binary "modulo" | ||
192 | moduli: | ||
193 | echo | ||
194 | |||
183 | clean: | 195 | clean: |
184 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 196 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
185 | rm -f *.out core | 197 | rm -f *.out core |
186 | (cd openbsd-compat && $(MAKE) clean) | 198 | (cd openbsd-compat && $(MAKE) clean) |
199 | (cd regress && $(MAKE) clean) | ||
187 | 200 | ||
188 | distclean: | 201 | distclean: |
189 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 202 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
@@ -192,16 +205,14 @@ distclean: | |||
192 | rm -rf autom4te.cache | 205 | rm -rf autom4te.cache |
193 | (cd openbsd-compat && $(MAKE) distclean) | 206 | (cd openbsd-compat && $(MAKE) distclean) |
194 | (cd scard && $(MAKE) distclean) | 207 | (cd scard && $(MAKE) distclean) |
208 | (cd regress && $(MAKE) distclean) | ||
195 | 209 | ||
196 | veryclean: | 210 | veryclean: distclean |
197 | rm -f configure config.h.in *.0 | 211 | rm -f configure config.h.in *.0 |
198 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | ||
199 | rm -f *.out core | ||
200 | rm -f Makefile config.h config.status ssh_prng_cmds *~ | ||
201 | (cd openbsd-compat && $(MAKE) distclean) | ||
202 | (cd scard && $(MAKE) distclean) | ||
203 | 212 | ||
204 | mrproper: distclean | 213 | mrproper: veryclean |
214 | |||
215 | realclean: veryclean | ||
205 | 216 | ||
206 | catman-do: | 217 | catman-do: |
207 | @for f in $(MANPAGES_IN) ; do \ | 218 | @for f in $(MANPAGES_IN) ; do \ |
@@ -215,8 +226,8 @@ distprep: catman-do | |||
215 | $(AUTORECONF) | 226 | $(AUTORECONF) |
216 | (cd scard && $(MAKE) -f Makefile.in distprep) | 227 | (cd scard && $(MAKE) -f Makefile.in distprep) |
217 | 228 | ||
218 | install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key check-config | 229 | install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files host-key check-config |
219 | install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files | 230 | install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files |
220 | 231 | ||
221 | check-config: | 232 | check-config: |
222 | -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config | 233 | -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config |
@@ -280,7 +291,6 @@ install-files: scard-install | |||
280 | echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ | 291 | echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ |
281 | fi | 292 | fi |
282 | @if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ | 293 | @if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ |
283 | $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \ | ||
284 | if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ | 294 | if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ |
285 | $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ | 295 | $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ |
286 | else \ | 296 | else \ |
@@ -359,3 +369,32 @@ uninstall: | |||
359 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 369 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
360 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 | 370 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 |
361 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 371 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
372 | |||
373 | tests: $(TARGETS) | ||
374 | BUILDDIR=`pwd`; \ | ||
375 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \ | ||
376 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ | ||
377 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ | ||
378 | TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ | ||
379 | TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add"; \ | ||
380 | TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \ | ||
381 | TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \ | ||
382 | TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \ | ||
383 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ | ||
384 | cd $(srcdir)/regress || exit $$?; \ | ||
385 | $(MAKE) \ | ||
386 | .OBJDIR="$${BUILDDIR}/regress" \ | ||
387 | .CURDIR="`pwd`" \ | ||
388 | BUILDDIR="$${BUILDDIR}" \ | ||
389 | OBJ="$${BUILDDIR}/regress/" \ | ||
390 | PATH="$${BUILDDIR}:$${PATH}" \ | ||
391 | TEST_SSH_SSH="$${TEST_SSH_SSH}" \ | ||
392 | TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ | ||
393 | TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \ | ||
394 | TEST_SSH_SSHADD="$${TEST_SSH_SSHADD}" \ | ||
395 | TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \ | ||
396 | TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ | ||
397 | TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ | ||
398 | TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ | ||
399 | EXEEXT="$(EXEEXT)" \ | ||
400 | $@ | ||