diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 101 |
1 files changed, 50 insertions, 51 deletions
diff --git a/Makefile.in b/Makefile.in index 08b989a4d..1afb4f798 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,5 +1,3 @@ | |||
1 | # $Id: Makefile.in,v 1.365 2014/08/30 06:23:07 djm Exp $ | ||
2 | |||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 1 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 2 | #SHELL = @SH@ |
5 | 3 | ||
@@ -54,16 +52,25 @@ AR=@AR@ | |||
54 | AWK=@AWK@ | 52 | AWK=@AWK@ |
55 | RANLIB=@RANLIB@ | 53 | RANLIB=@RANLIB@ |
56 | INSTALL=@INSTALL@ | 54 | INSTALL=@INSTALL@ |
57 | PERL=@PERL@ | ||
58 | SED=@SED@ | 55 | SED=@SED@ |
59 | ENT=@ENT@ | 56 | ENT=@ENT@ |
60 | XAUTH_PATH=@XAUTH_PATH@ | 57 | XAUTH_PATH=@XAUTH_PATH@ |
61 | LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ | 58 | LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ |
62 | EXEEXT=@EXEEXT@ | 59 | EXEEXT=@EXEEXT@ |
63 | MANFMT=@MANFMT@ | 60 | MANFMT=@MANFMT@ |
61 | MKDIR_P=@MKDIR_P@ | ||
64 | 62 | ||
65 | TARGETS=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) sftp-server$(EXEEXT) sftp$(EXEEXT) | 63 | TARGETS=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) sftp-server$(EXEEXT) sftp$(EXEEXT) |
66 | 64 | ||
65 | XMSS_OBJS=\ | ||
66 | ssh-xmss.o \ | ||
67 | sshkey-xmss.o \ | ||
68 | xmss_commons.o \ | ||
69 | xmss_fast.o \ | ||
70 | xmss_hash.o \ | ||
71 | xmss_hash_address.o \ | ||
72 | xmss_wots.o | ||
73 | |||
67 | LIBOPENSSH_OBJS=\ | 74 | LIBOPENSSH_OBJS=\ |
68 | ssh_api.o \ | 75 | ssh_api.o \ |
69 | ssherr.o \ | 76 | ssherr.o \ |
@@ -73,7 +80,8 @@ LIBOPENSSH_OBJS=\ | |||
73 | sshbuf-misc.o \ | 80 | sshbuf-misc.o \ |
74 | sshbuf-getput-crypto.o \ | 81 | sshbuf-getput-crypto.o \ |
75 | krl.o \ | 82 | krl.o \ |
76 | bitmap.o | 83 | bitmap.o \ |
84 | ${XMSS_OBJS} | ||
77 | 85 | ||
78 | LIBSSH_OBJS=${LIBOPENSSH_OBJS} \ | 86 | LIBSSH_OBJS=${LIBOPENSSH_OBJS} \ |
79 | authfd.o authfile.o bufaux.o bufbn.o bufec.o buffer.o \ | 87 | authfd.o authfile.o bufaux.o bufbn.o bufec.o buffer.o \ |
@@ -88,7 +96,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \ | |||
88 | ssh-pkcs11.o smult_curve25519_ref.o \ | 96 | ssh-pkcs11.o smult_curve25519_ref.o \ |
89 | poly1305.o chacha.o cipher-chachapoly.o \ | 97 | poly1305.o chacha.o cipher-chachapoly.o \ |
90 | ssh-ed25519.o digest-openssl.o digest-libc.o hmac.o \ | 98 | ssh-ed25519.o digest-openssl.o digest-libc.o hmac.o \ |
91 | sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o blocks.o \ | 99 | sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o \ |
92 | kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \ | 100 | kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \ |
93 | kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \ | 101 | kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \ |
94 | kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o \ | 102 | kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o \ |
@@ -219,13 +227,6 @@ $(CONFIGFILES): $(CONFIGFILES_IN) | |||
219 | moduli: | 227 | moduli: |
220 | echo | 228 | echo |
221 | 229 | ||
222 | # special case target for umac128 | ||
223 | umac128.o: umac.c | ||
224 | $(CC) $(CFLAGS) $(CPPFLAGS) -o umac128.o -c $(srcdir)/umac.c \ | ||
225 | -DUMAC_OUTPUT_LEN=16 -Dumac_new=umac128_new \ | ||
226 | -Dumac_update=umac128_update -Dumac_final=umac128_final \ | ||
227 | -Dumac_delete=umac128_delete -Dumac_ctx=umac128_ctx | ||
228 | |||
229 | clean: regressclean | 230 | clean: regressclean |
230 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 231 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
231 | rm -f *.out core survey | 232 | rm -f *.out core survey |
@@ -299,9 +300,21 @@ catman-do: | |||
299 | >$$base.0 ; \ | 300 | >$$base.0 ; \ |
300 | done | 301 | done |
301 | 302 | ||
302 | distprep: catman-do | 303 | depend: depend-rebuild |
304 | rm -f .depend.bak | ||
305 | |||
306 | depend-rebuild: | ||
307 | rm -f config.h | ||
308 | touch config.h | ||
309 | makedepend -w1000 -Y. -f .depend *.c 2>/dev/null | ||
310 | rm -f config.h | ||
311 | |||
312 | depend-check: depend-rebuild | ||
313 | cmp .depend .depend.bak || (echo .depend stale && exit 1) | ||
314 | |||
315 | distprep: catman-do depend-check | ||
303 | $(AUTORECONF) | 316 | $(AUTORECONF) |
304 | -rm -rf autom4te.cache | 317 | -rm -rf autom4te.cache .depend.bak |
305 | 318 | ||
306 | install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config | 319 | install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config |
307 | install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf | 320 | install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf |
@@ -311,14 +324,13 @@ check-config: | |||
311 | -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config | 324 | -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config |
312 | 325 | ||
313 | install-files: | 326 | install-files: |
314 | $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) | 327 | $(MKDIR_P) $(DESTDIR)$(bindir) |
315 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) | 328 | $(MKDIR_P) $(DESTDIR)$(sbindir) |
316 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir) | 329 | $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)1 |
317 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1 | 330 | $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 |
318 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5 | 331 | $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 |
319 | $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8 | 332 | $(MKDIR_P) $(DESTDIR)$(libexecdir) |
320 | $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir) | 333 | $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) |
321 | (umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH)) | ||
322 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) | 334 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) |
323 | $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) | 335 | $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) |
324 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-add$(EXEEXT) $(DESTDIR)$(bindir)/ssh-add$(EXEEXT) | 336 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-add$(EXEEXT) $(DESTDIR)$(bindir)/ssh-add$(EXEEXT) |
@@ -347,9 +359,7 @@ install-files: | |||
347 | $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | 359 | $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 |
348 | 360 | ||
349 | install-sysconf: | 361 | install-sysconf: |
350 | if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ | 362 | $(MKDIR_P) $(DESTDIR)$(sysconfdir) |
351 | $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ | ||
352 | fi | ||
353 | @if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ | 363 | @if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config ]; then \ |
354 | $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ | 364 | $(INSTALL) -m 644 ssh_config.out $(DESTDIR)$(sysconfdir)/ssh_config; \ |
355 | else \ | 365 | else \ |
@@ -377,9 +387,6 @@ host-key: ssh-keygen$(EXEEXT) | |||
377 | fi | 387 | fi |
378 | 388 | ||
379 | host-key-force: ssh-keygen$(EXEEXT) ssh$(EXEEXT) | 389 | host-key-force: ssh-keygen$(EXEEXT) ssh$(EXEEXT) |
380 | if ./ssh -Q protocol-version | grep '^1$$' >/dev/null; then \ | ||
381 | ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N ""; \ | ||
382 | fi | ||
383 | ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" | 390 | ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" |
384 | ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" | 391 | ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" |
385 | ./ssh-keygen -t ed25519 -f $(DESTDIR)$(sysconfdir)/ssh_host_ed25519_key -N "" | 392 | ./ssh-keygen -t ed25519 -f $(DESTDIR)$(sysconfdir)/ssh_host_ed25519_key -N "" |
@@ -423,28 +430,16 @@ uninstall: | |||
423 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | 430 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 |
424 | 431 | ||
425 | regress-prep: | 432 | regress-prep: |
426 | [ -d `pwd`/regress ] || mkdir -p `pwd`/regress | 433 | $(MKDIR_P) `pwd`/regress/unittests/test_helper |
427 | [ -d `pwd`/regress/unittests ] || mkdir -p `pwd`/regress/unittests | 434 | $(MKDIR_P) `pwd`/regress/unittests/sshbuf |
428 | [ -d `pwd`/regress/unittests/test_helper ] || \ | 435 | $(MKDIR_P) `pwd`/regress/unittests/sshkey |
429 | mkdir -p `pwd`/regress/unittests/test_helper | 436 | $(MKDIR_P) `pwd`/regress/unittests/bitmap |
430 | [ -d `pwd`/regress/unittests/sshbuf ] || \ | 437 | $(MKDIR_P) `pwd`/regress/unittests/conversion |
431 | mkdir -p `pwd`/regress/unittests/sshbuf | 438 | $(MKDIR_P) `pwd`/regress/unittests/hostkeys |
432 | [ -d `pwd`/regress/unittests/sshkey ] || \ | 439 | $(MKDIR_P) `pwd`/regress/unittests/kex |
433 | mkdir -p `pwd`/regress/unittests/sshkey | 440 | $(MKDIR_P) `pwd`/regress/unittests/match |
434 | [ -d `pwd`/regress/unittests/bitmap ] || \ | 441 | $(MKDIR_P) `pwd`/regress/unittests/utf8 |
435 | mkdir -p `pwd`/regress/unittests/bitmap | 442 | $(MKDIR_P) `pwd`/regress/misc/kexfuzz |
436 | [ -d `pwd`/regress/unittests/conversion ] || \ | ||
437 | mkdir -p `pwd`/regress/unittests/conversion | ||
438 | [ -d `pwd`/regress/unittests/hostkeys ] || \ | ||
439 | mkdir -p `pwd`/regress/unittests/hostkeys | ||
440 | [ -d `pwd`/regress/unittests/kex ] || \ | ||
441 | mkdir -p `pwd`/regress/unittests/kex | ||
442 | [ -d `pwd`/regress/unittests/match ] || \ | ||
443 | mkdir -p `pwd`/regress/unittests/match | ||
444 | [ -d `pwd`/regress/unittests/utf8 ] || \ | ||
445 | mkdir -p `pwd`/regress/unittests/utf8 | ||
446 | [ -d `pwd`/regress/misc/kexfuzz ] || \ | ||
447 | mkdir -p `pwd`/regress/misc/kexfuzz | ||
448 | [ -f `pwd`/regress/Makefile ] || \ | 443 | [ -f `pwd`/regress/Makefile ] || \ |
449 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile | 444 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile |
450 | 445 | ||
@@ -584,6 +579,8 @@ regress-binaries: regress/modpipe$(EXEEXT) \ | |||
584 | regress/unittests/utf8/test_utf8$(EXEEXT) \ | 579 | regress/unittests/utf8/test_utf8$(EXEEXT) \ |
585 | regress/misc/kexfuzz/kexfuzz$(EXEEXT) | 580 | regress/misc/kexfuzz/kexfuzz$(EXEEXT) |
586 | 581 | ||
582 | REGRESSTMP = "$(PWD)/regress" | ||
583 | |||
587 | tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS) | 584 | tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS) |
588 | BUILDDIR=`pwd`; \ | 585 | BUILDDIR=`pwd`; \ |
589 | TEST_SSH_SCP="$${BUILDDIR}/scp"; \ | 586 | TEST_SSH_SCP="$${BUILDDIR}/scp"; \ |
@@ -607,7 +604,7 @@ tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS) | |||
607 | .OBJDIR="$${BUILDDIR}/regress" \ | 604 | .OBJDIR="$${BUILDDIR}/regress" \ |
608 | .CURDIR="`pwd`" \ | 605 | .CURDIR="`pwd`" \ |
609 | BUILDDIR="$${BUILDDIR}" \ | 606 | BUILDDIR="$${BUILDDIR}" \ |
610 | OBJ="$${BUILDDIR}/regress/" \ | 607 | OBJ="$(REGRESSTMP)" \ |
611 | PATH="$${BUILDDIR}:$${PATH}" \ | 608 | PATH="$${BUILDDIR}:$${PATH}" \ |
612 | TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ | 609 | TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ |
613 | TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ | 610 | TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ |
@@ -652,3 +649,5 @@ package: $(CONFIGFILES) $(MANPAGES) $(TARGETS) | |||
652 | if [ "@MAKE_PACKAGE_SUPPORTED@" = yes ]; then \ | 649 | if [ "@MAKE_PACKAGE_SUPPORTED@" = yes ]; then \ |
653 | sh buildpkg.sh; \ | 650 | sh buildpkg.sh; \ |
654 | fi | 651 | fi |
652 | |||
653 | # @DEPEND@ | ||