diff options
| author | Damien Miller <djm@mindrot.org> | 2014-08-20 11:06:20 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-08-20 11:06:20 +1000 |
| commit | c5089ecaec3b2c02f014f4e67518390702a4ba14 (patch) | |
| tree | f0976079f608ef309c6536f76a7bac33f1d5a776 | |
| parent | 2195847e503a382f83ee969b0a8bd3dfe0e55c18 (diff) | |
| download | openssh-git-c5089ecaec3b2c02f014f4e67518390702a4ba14.tar.gz | |
- (djm) [Makefile.in] refer to libtest_helper.a by explicit path rather than
-L/-l; fixes linking problems on some platforms
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Makefile.in | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -1,6 +1,8 @@ 2014020 - (djm) [configure.ac] Check OpenSSL version is supported at configure time; suggested by Kevin Brott + - (djm) [Makefile.in] refer to libtest_helper.a by explicit path rather than + -L/-l; fixes linking problems on some platforms 20140819 - (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen diff --git a/Makefile.in b/Makefile.in index 78a4cba9..0302b6c4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.362 2014/07/18 20:33:12 dtucker Exp $ +# $Id: Makefile.in,v 1.363 2014/08/20 01:06:21 djm Exp $ # uncomment if you run a non bourne compatable shell. Ie. csh #SHELL = @SH@ @@ -456,7 +456,7 @@ UNITTESTS_TEST_SSHBUF_OBJS=\ regress/unittests/sshbuf/test_sshbuf$(EXEEXT): ${UNITTESTS_TEST_SSHBUF_OBJS} \ regress/unittests/test_helper/libtest_helper.a libssh.a $(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_SSHBUF_OBJS) \ - -L regress/unittests/test_helper -ltest_helper \ + regress/unittests/test_helper/libtest_helper.a \ -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) UNITTESTS_TEST_SSHKEY_OBJS=\ |