diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 73 |
1 files changed, 30 insertions, 43 deletions
diff --git a/Makefile.in b/Makefile.in index e7549470c..c9e4294d3 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -103,7 +103,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \ | |||
103 | ssh-ed25519-sk.o ssh-rsa.o dh.o \ | 103 | ssh-ed25519-sk.o ssh-rsa.o dh.o \ |
104 | msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ | 104 | msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ |
105 | ssh-pkcs11.o smult_curve25519_ref.o \ | 105 | ssh-pkcs11.o smult_curve25519_ref.o \ |
106 | poly1305.o chacha.o cipher-chachapoly.o \ | 106 | poly1305.o chacha.o cipher-chachapoly.o cipher-chachapoly-libcrypto.o \ |
107 | ssh-ed25519.o digest-openssl.o digest-libc.o \ | 107 | ssh-ed25519.o digest-openssl.o digest-libc.o \ |
108 | hmac.o sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o \ | 108 | hmac.o sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o \ |
109 | kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \ | 109 | kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \ |
@@ -350,11 +350,15 @@ depend: depend-rebuild | |||
350 | rm -f .depend.bak | 350 | rm -f .depend.bak |
351 | 351 | ||
352 | depend-rebuild: | 352 | depend-rebuild: |
353 | rm -f config.h | 353 | mv .depend .depend.old |
354 | touch config.h | 354 | rm -f config.h .depend |
355 | touch config.h .depend | ||
355 | makedepend -w1000 -Y. -f .depend *.c 2>/dev/null | 356 | makedepend -w1000 -Y. -f .depend *.c 2>/dev/null |
356 | (head -2 .depend; tail +3 .depend | sort) >.depend.tmp | 357 | (echo '# Automatically generated by makedepend.'; \ |
358 | echo '# Run "make depend" to rebuild.'; sort .depend ) >.depend.tmp | ||
357 | mv .depend.tmp .depend | 359 | mv .depend.tmp .depend |
360 | rm -f .depend.bak | ||
361 | mv .depend.old .depend.bak | ||
358 | rm -f config.h | 362 | rm -f config.h |
359 | 363 | ||
360 | depend-check: depend-rebuild | 364 | depend-check: depend-rebuild |
@@ -631,6 +635,8 @@ SK_DUMMY_OBJS=\ | |||
631 | regress/misc/sk-dummy/fatal.lo \ | 635 | regress/misc/sk-dummy/fatal.lo \ |
632 | ed25519.lo hash.lo ge25519.lo fe25519.lo sc25519.lo verify.lo | 636 | ed25519.lo hash.lo ge25519.lo fe25519.lo sc25519.lo verify.lo |
633 | 637 | ||
638 | SK_DUMMY_LIBRARY=@SK_DUMMY_LIBRARY@ | ||
639 | |||
634 | .c.lo: Makefile.in config.h | 640 | .c.lo: Makefile.in config.h |
635 | $(CC) $(CFLAGS_NOPIE) $(PICFLAG) $(CPPFLAGS) -c $< -o $@ | 641 | $(CC) $(CFLAGS_NOPIE) $(PICFLAG) $(CPPFLAGS) -c $< -o $@ |
636 | 642 | ||
@@ -644,7 +650,7 @@ regress-binaries: regress-prep $(LIBCOMPAT) \ | |||
644 | regress/netcat$(EXEEXT) \ | 650 | regress/netcat$(EXEEXT) \ |
645 | regress/check-perm$(EXEEXT) \ | 651 | regress/check-perm$(EXEEXT) \ |
646 | regress/mkdtemp$(EXEEXT) \ | 652 | regress/mkdtemp$(EXEEXT) \ |
647 | regress/misc/sk-dummy/sk-dummy.so | 653 | $(SK_DUMMY_LIBRARY) |
648 | 654 | ||
649 | regress-unit-binaries: regress-prep $(REGRESSLIBS) \ | 655 | regress-unit-binaries: regress-prep $(REGRESSLIBS) \ |
650 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ | 656 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ |
@@ -670,27 +676,8 @@ unit: regress-unit-binaries | |||
670 | 676 | ||
671 | interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS) | 677 | interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS) |
672 | BUILDDIR=`pwd`; \ | 678 | BUILDDIR=`pwd`; \ |
673 | TEST_SSH_SCP="$${BUILDDIR}/scp"; \ | ||
674 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ | ||
675 | TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ | ||
676 | TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \ | ||
677 | TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add"; \ | ||
678 | TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \ | ||
679 | TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper"; \ | ||
680 | TEST_SSH_SSHSKHELPER="$${BUILDDIR}/ssh-sk-helper"; \ | ||
681 | TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \ | ||
682 | TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \ | ||
683 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ | ||
684 | TEST_SSH_PKCS11_HELPER="$${BUILDDIR}/ssh-pkcs11-helper"; \ | ||
685 | TEST_SSH_SK_HELPER="$${BUILDDIR}/ssh-sk-helper"; \ | ||
686 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ | ||
687 | TEST_SSH_PLINK="plink"; \ | ||
688 | TEST_SSH_PUTTYGEN="puttygen"; \ | ||
689 | TEST_SSH_CONCH="conch"; \ | ||
690 | TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ | ||
691 | TEST_SSH_UTF8="@TEST_SSH_UTF8@" ; \ | ||
692 | TEST_SSH_ECC="@TEST_SSH_ECC@" ; \ | ||
693 | cd $(srcdir)/regress || exit $$?; \ | 679 | cd $(srcdir)/regress || exit $$?; \ |
680 | EGREP='@EGREP@' \ | ||
694 | $(MAKE) \ | 681 | $(MAKE) \ |
695 | .OBJDIR="$${BUILDDIR}/regress" \ | 682 | .OBJDIR="$${BUILDDIR}/regress" \ |
696 | .CURDIR="`pwd`" \ | 683 | .CURDIR="`pwd`" \ |
@@ -699,24 +686,24 @@ interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS) | |||
699 | PATH="$${BUILDDIR}:$${PATH}" \ | 686 | PATH="$${BUILDDIR}:$${PATH}" \ |
700 | TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ | 687 | TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ |
701 | TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ | 688 | TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ |
702 | TEST_SSH_SCP="$${TEST_SSH_SCP}" \ | 689 | TEST_SSH_SCP="$${BUILDDIR}/scp" \ |
703 | TEST_SSH_SSH="$${TEST_SSH_SSH}" \ | 690 | TEST_SSH_SSH="$${BUILDDIR}/ssh" \ |
704 | TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ | 691 | TEST_SSH_SSHD="$${BUILDDIR}/sshd" \ |
705 | TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \ | 692 | TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent" \ |
706 | TEST_SSH_SSHADD="$${TEST_SSH_SSHADD}" \ | 693 | TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add" \ |
707 | TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \ | 694 | TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen" \ |
708 | TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \ | 695 | TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper" \ |
709 | TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ | 696 | TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan" \ |
710 | TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ | 697 | TEST_SSH_SFTP="$${BUILDDIR}/sftp" \ |
711 | TEST_SSH_PKCS11_HELPER="$${TEST_SSH_PKCS11_HELPER}" \ | 698 | TEST_SSH_PKCS11_HELPER="$${BUILDDIR}/ssh-pkcs11-helper" \ |
712 | TEST_SSH_SK_HELPER="$${TEST_SSH_SK_HELPER}" \ | 699 | TEST_SSH_SK_HELPER="$${BUILDDIR}/ssh-sk-helper" \ |
713 | TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ | 700 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server" \ |
714 | TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ | 701 | TEST_SSH_PLINK="plink" \ |
715 | TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ | 702 | TEST_SSH_PUTTYGEN="puttygen" \ |
716 | TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \ | 703 | TEST_SSH_CONCH="conch" \ |
717 | TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ | 704 | TEST_SSH_IPV6="@TEST_SSH_IPV6@" \ |
718 | TEST_SSH_UTF8="$${TEST_SSH_UTF8}" \ | 705 | TEST_SSH_UTF8="@TEST_SSH_UTF8@" \ |
719 | TEST_SSH_ECC="$${TEST_SSH_ECC}" \ | 706 | TEST_SSH_ECC="@TEST_SSH_ECC@" \ |
720 | TEST_SHELL="${TEST_SHELL}" \ | 707 | TEST_SHELL="${TEST_SHELL}" \ |
721 | EXEEXT="$(EXEEXT)" \ | 708 | EXEEXT="$(EXEEXT)" \ |
722 | $@ && echo all $@ passed | 709 | $@ && echo all $@ passed |