Deleted Added
sdiff udiff text old ( 214979 ) new ( 218767 )
full compact
Makefile.in (214979) Makefile.in (218767)
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
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@

--- 43 unchanged lines hidden (view full) ---

53RANLIB=@RANLIB@
54INSTALL=@INSTALL@
55PERL=@PERL@
56SED=@SED@
57ENT=@ENT@
58XAUTH_PATH=@XAUTH_PATH@
59LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
60EXEEXT=@EXEEXT@
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@

--- 43 unchanged lines hidden (view full) ---

53RANLIB=@RANLIB@
54INSTALL=@INSTALL@
55PERL=@PERL@
56SED=@SED@
57ENT=@ENT@
58XAUTH_PATH=@XAUTH_PATH@
59LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
60EXEEXT=@EXEEXT@
61MANFMT=@MANFMT@
61
62INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
63INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@
64
65TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT)
66
67LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
68 canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \
69 cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
70 compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
71 log.o match.o md-sha256.o moduli.o nchan.o packet.o \
72 readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \
73 atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
62
63INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
64INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@
65
66TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT)
67
68LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
69 canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \
70 cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
71 compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
72 log.o match.o md-sha256.o moduli.o nchan.o packet.o \
73 readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \
74 atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
74 monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
75 kexgex.o kexdhc.o kexgexc.o msg.o progressmeter.o dns.o \
76 entropy.o gss-genr.o umac.o jpake.o schnorr.o \
77 ssh-pkcs11.o
75 monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \
76 kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \
77 msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o jpake.o \
78 schnorr.o ssh-pkcs11.o
78
79SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
80 sshconnect.o sshconnect1.o sshconnect2.o mux.o \
81 roaming_common.o roaming_client.o
82
83SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
79
80SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
81 sshconnect.o sshconnect1.o sshconnect2.o mux.o \
82 roaming_common.o roaming_client.o
83
84SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
85 audit.o audit-bsm.o audit-linux.o platform.o \
84 sshpty.o sshlogin.o servconf.o serverloop.o \
85 auth.o auth1.o auth2.o auth-options.o session.o \
86 auth-chall.o auth2-chall.o groupaccess.o \
87 auth-skey.o auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
88 auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \
86 sshpty.o sshlogin.o servconf.o serverloop.o \
87 auth.o auth1.o auth2.o auth-options.o session.o \
88 auth-chall.o auth2-chall.o groupaccess.o \
89 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 \
89 monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o \
91 monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o \
90 auth-krb5.o \
91 auth2-gss.o gss-serv.o gss-serv-krb5.o \
92 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
92 auth-krb5.o \
93 auth2-gss.o gss-serv.o gss-serv-krb5.o \
94 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
93 audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \
95 sftp-server.o sftp-common.o \
94 roaming_common.o roaming_serv.o
95
96MANPAGES = 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 sshd_config.5.out ssh_config.5.out
97MANPAGES_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 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5
98MANTYPE = @MANTYPE@
99
100CONFIGFILES=sshd_config.out ssh_config.out moduli.out
101CONFIGFILES_IN=sshd_config ssh_config moduli
102
103PATHSUBS = \
104 -e 's|/etc/ssh/ssh_prng_cmds|$(sysconfdir)/ssh_prng_cmds|g' \
105 -e 's|/etc/ssh/ssh_config|$(sysconfdir)/ssh_config|g' \
106 -e 's|/etc/ssh/ssh_known_hosts|$(sysconfdir)/ssh_known_hosts|g' \
107 -e 's|/etc/ssh/sshd_config|$(sysconfdir)/sshd_config|g' \
108 -e 's|/usr/libexec|$(libexecdir)|g' \
109 -e 's|/etc/shosts.equiv|$(sysconfdir)/shosts.equiv|g' \
110 -e 's|/etc/ssh/ssh_host_key|$(sysconfdir)/ssh_host_key|g' \
96 roaming_common.o roaming_serv.o
97
98MANPAGES = 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 sshd_config.5.out ssh_config.5.out
99MANPAGES_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 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5
100MANTYPE = @MANTYPE@
101
102CONFIGFILES=sshd_config.out ssh_config.out moduli.out
103CONFIGFILES_IN=sshd_config ssh_config moduli
104
105PATHSUBS = \
106 -e 's|/etc/ssh/ssh_prng_cmds|$(sysconfdir)/ssh_prng_cmds|g' \
107 -e 's|/etc/ssh/ssh_config|$(sysconfdir)/ssh_config|g' \
108 -e 's|/etc/ssh/ssh_known_hosts|$(sysconfdir)/ssh_known_hosts|g' \
109 -e 's|/etc/ssh/sshd_config|$(sysconfdir)/sshd_config|g' \
110 -e 's|/usr/libexec|$(libexecdir)|g' \
111 -e 's|/etc/shosts.equiv|$(sysconfdir)/shosts.equiv|g' \
112 -e 's|/etc/ssh/ssh_host_key|$(sysconfdir)/ssh_host_key|g' \
113 -e 's|/etc/ssh/ssh_host_ecdsa_key|$(sysconfdir)/ssh_host_ecdsa_key|g' \
111 -e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \
112 -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \
113 -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
114 -e 's|/etc/moduli|$(sysconfdir)/moduli|g' \
115 -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \
116 -e 's|/etc/ssh/sshrc|$(sysconfdir)/sshrc|g' \
117 -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \
118 -e 's|/var/empty|$(PRIVSEP_PATH)|g' \

--- 106 unchanged lines hidden (view full) ---

225mrproper: veryclean
226
227realclean: veryclean
228
229catman-do:
230 @for f in $(MANPAGES_IN) ; do \
231 base=`echo $$f | sed 's/\..*$$//'` ; \
232 echo "$$f -> $$base.0" ; \
114 -e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \
115 -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \
116 -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
117 -e 's|/etc/moduli|$(sysconfdir)/moduli|g' \
118 -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \
119 -e 's|/etc/ssh/sshrc|$(sysconfdir)/sshrc|g' \
120 -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \
121 -e 's|/var/empty|$(PRIVSEP_PATH)|g' \

--- 106 unchanged lines hidden (view full) ---

228mrproper: veryclean
229
230realclean: veryclean
231
232catman-do:
233 @for f in $(MANPAGES_IN) ; do \
234 base=`echo $$f | sed 's/\..*$$//'` ; \
235 echo "$$f -> $$base.0" ; \
233 nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \
236 $(MANFMT) $$f | cat -v | sed -e 's/.\^H//g' \
234 >$$base.0 ; \
235 done
236
237distprep: catman-do
238 $(AUTORECONF)
239 -rm -rf autom4te.cache
240
241install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config

--- 77 unchanged lines hidden (view full) ---

319 $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \
320 fi ; \
321 else \
322 echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \
323 fi
324
325host-key: ssh-keygen$(EXEEXT)
326 @if [ -z "$(DESTDIR)" ] ; then \
237 >$$base.0 ; \
238 done
239
240distprep: catman-do
241 $(AUTORECONF)
242 -rm -rf autom4te.cache
243
244install: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config

--- 77 unchanged lines hidden (view full) ---

322 $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \
323 fi ; \
324 else \
325 echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \
326 fi
327
328host-key: ssh-keygen$(EXEEXT)
329 @if [ -z "$(DESTDIR)" ] ; then \
327 if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \
328 echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \
330 if [ -f "$(sysconfdir)/ssh_host_key" ] ; then \
331 echo "$(sysconfdir)/ssh_host_key already exists, skipping." ; \
329 else \
332 else \
330 ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" ; \
333 ./ssh-keygen -t rsa1 -f $(sysconfdir)/ssh_host_key -N "" ; \
331 fi ; \
334 fi ; \
332 if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key ] ; then \
333 echo "$(DESTDIR)$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \
335 if [ -f $(sysconfdir)/ssh_host_dsa_key ] ; then \
336 echo "$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \
334 else \
337 else \
335 ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" ; \
338 ./ssh-keygen -t dsa -f $(sysconfdir)/ssh_host_dsa_key -N "" ; \
336 fi ; \
339 fi ; \
337 if [ -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key ] ; then \
338 echo "$(DESTDIR)$(sysconfdir)/ssh_host_rsa_key already exists, skipping." ; \
340 if [ -f $(sysconfdir)/ssh_host_rsa_key ] ; then \
341 echo "$(sysconfdir)/ssh_host_rsa_key already exists, skipping." ; \
339 else \
342 else \
340 ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" ; \
343 ./ssh-keygen -t rsa -f $(sysconfdir)/ssh_host_rsa_key -N "" ; \
341 fi ; \
344 fi ; \
345 if [ -z "@COMMENT_OUT_ECC@" ] ; then \
346 if [ -f $(sysconfdir)/ssh_host_ecdsa_key ] ; then \
347 echo "$(sysconfdir)/ssh_host_ecdsa_key already exists, skipping." ; \
348 else \
349 ./ssh-keygen -t ecdsa -f $(sysconfdir)/ssh_host_ecdsa_key -N "" ; \
350 fi ; \
351 fi ; \
342 fi ;
343
344host-key-force: ssh-keygen$(EXEEXT)
345 ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N ""
346 ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N ""
347 ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N ""
352 fi ;
353
354host-key-force: ssh-keygen$(EXEEXT)
355 ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N ""
356 ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N ""
357 ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N ""
358 test -z "@COMMENT_OUT_ECC@" && ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N ""
348
349uninstallall: uninstall
350 -rm -f $(DESTDIR)$(sysconfdir)/ssh_config
351 -rm -f $(DESTDIR)$(sysconfdir)/sshd_config
352 -rm -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds
353 -rmdir $(DESTDIR)$(sysconfdir)
354 -rmdir $(DESTDIR)$(bindir)
355 -rmdir $(DESTDIR)$(sbindir)

--- 44 unchanged lines hidden (view full) ---

400 TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper"; \
401 TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \
402 TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \
403 TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \
404 TEST_SSH_PLINK="plink"; \
405 TEST_SSH_PUTTYGEN="puttygen"; \
406 TEST_SSH_CONCH="conch"; \
407 TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \
359
360uninstallall: uninstall
361 -rm -f $(DESTDIR)$(sysconfdir)/ssh_config
362 -rm -f $(DESTDIR)$(sysconfdir)/sshd_config
363 -rm -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds
364 -rmdir $(DESTDIR)$(sysconfdir)
365 -rmdir $(DESTDIR)$(bindir)
366 -rmdir $(DESTDIR)$(sbindir)

--- 44 unchanged lines hidden (view full) ---

411 TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper"; \
412 TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \
413 TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \
414 TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \
415 TEST_SSH_PLINK="plink"; \
416 TEST_SSH_PUTTYGEN="puttygen"; \
417 TEST_SSH_CONCH="conch"; \
418 TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \
419 TEST_SSH_ECC="@TEST_SSH_ECC@" ; \
420 TEST_SSH_SHA256="@TEST_SSH_SHA256@" ; \
408 cd $(srcdir)/regress || exit $$?; \
409 $(MAKE) \
410 .OBJDIR="$${BUILDDIR}/regress" \
411 .CURDIR="`pwd`" \
412 BUILDDIR="$${BUILDDIR}" \
413 OBJ="$${BUILDDIR}/regress/" \
414 PATH="$${BUILDDIR}:$${PATH}" \
415 TEST_SHELL="$${TEST_SHELL}" \

--- 4 unchanged lines hidden (view full) ---

420 TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \
421 TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \
422 TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \
423 TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \
424 TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
425 TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \
426 TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \
427 TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \
421 cd $(srcdir)/regress || exit $$?; \
422 $(MAKE) \
423 .OBJDIR="$${BUILDDIR}/regress" \
424 .CURDIR="`pwd`" \
425 BUILDDIR="$${BUILDDIR}" \
426 OBJ="$${BUILDDIR}/regress/" \
427 PATH="$${BUILDDIR}:$${PATH}" \
428 TEST_SHELL="$${TEST_SHELL}" \

--- 4 unchanged lines hidden (view full) ---

433 TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \
434 TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \
435 TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \
436 TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \
437 TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
438 TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \
439 TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \
440 TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \
428 TEST_SSH_IPV6="@TEST_SSH_IPV6@" \
441 TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \
442 TEST_SSH_ECC="$${TEST_SSH_ECC}" \
443 TEST_SSH_SHA256="$${TEST_SSH_SHA256}" \
429 EXEEXT="$(EXEEXT)" \
430 $@ && echo all tests passed
431
432compat-tests: $(LIBCOMPAT)
433 (cd openbsd-compat/regress && $(MAKE))
434
435regressclean:
436 if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \

--- 17 unchanged lines hidden --- 		444 EXEEXT="$(EXEEXT)" \
445 $@ && echo all tests passed
446
447compat-tests: $(LIBCOMPAT)
448 (cd openbsd-compat/regress && $(MAKE))
449
450regressclean:
451 if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \

--- 17 unchanged lines hidden ---