diff options
| author | Damien Miller <djm@mindrot.org> | 2010-03-13 22:41:34 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-03-13 22:41:34 +0100 |
| commit | 1f574b254663776209951b0327090c19c41c0749 (patch) | |
| tree | 2915693074e569f9966113d2ad28a9509f6e31d5 | |
| parent | - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix (diff) | |
| download | openssh-1f574b254663776209951b0327090c19c41c0749.tar.xz openssh-1f574b254663776209951b0327090c19c41c0749.zip | |
- (djm) [Makefile.in] Respecify -lssh after -lopenbsd-compat for
ssh-pkcs11-helper to repair static builds (we do the same for
ssh-keyscan). Reported by felix-mindrot AT fefe.de
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Makefile.in | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -2,6 +2,9 @@ - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix compilation failure when !HAVE_DLOPEN. Reported by felix-mindrot AT fefe.de + - (djm) [Makefile.in] Respecify -lssh after -lopenbsd-compat for + ssh-pkcs11-helper to repair static builds (we do the same for + ssh-keyscan). Reported by felix-mindrot AT fefe.de 20100312 - (tim) [Makefile.in] Now that scard is gone, no need to make $(datadir) diff --git a/Makefile.in b/Makefile.in index 839a40543..476674b0e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.308 2010/03/12 06:32:02 tim Exp $ +# $Id: Makefile.in,v 1.309 2010/03/13 21:41:34 djm Exp $ # uncomment if you run a non bourne compatable shell. Ie. csh #SHELL = @SH@ @@ -160,7 +160,7 @@ ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o roaming_dummy.o readco $(LD) -o $@ ssh-keysign.o readconf.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-pkcs11-helper.o ssh-pkcs11.o - $(LD) -o $@ ssh-pkcs11-helper.o ssh-pkcs11.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + $(LD) -o $@ ssh-pkcs11-helper.o ssh-pkcs11.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o roaming_dummy.o $(LD) -o $@ ssh-keyscan.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) |