diff options
author | Damien Miller <djm@mindrot.org> | 2010-03-14 08:41:34 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-03-14 08:41:34 +1100 |
commit | 1f574b254663776209951b0327090c19c41c0749 (patch) | |
tree | 2915693074e569f9966113d2ad28a9509f6e31d5 | |
parent | 47f9a4106a417d57ff784b3a7fcffb803d6df56d (diff) |
- (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 @@ | |||
2 | - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix | 2 | - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix |
3 | compilation failure when !HAVE_DLOPEN. Reported by felix-mindrot | 3 | compilation failure when !HAVE_DLOPEN. Reported by felix-mindrot |
4 | AT fefe.de | 4 | AT fefe.de |
5 | - (djm) [Makefile.in] Respecify -lssh after -lopenbsd-compat for | ||
6 | ssh-pkcs11-helper to repair static builds (we do the same for | ||
7 | ssh-keyscan). Reported by felix-mindrot AT fefe.de | ||
5 | 8 | ||
6 | 20100312 | 9 | 20100312 |
7 | - (tim) [Makefile.in] Now that scard is gone, no need to make $(datadir) | 10 | - (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 @@ | |||
1 | # $Id: Makefile.in,v 1.308 2010/03/12 06:32:02 tim Exp $ | 1 | # $Id: Makefile.in,v 1.309 2010/03/13 21:41:34 djm Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -160,7 +160,7 @@ ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o roaming_dummy.o readco | |||
160 | $(LD) -o $@ ssh-keysign.o readconf.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 160 | $(LD) -o $@ ssh-keysign.o readconf.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
161 | 161 | ||
162 | ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-pkcs11-helper.o ssh-pkcs11.o | 162 | ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-pkcs11-helper.o ssh-pkcs11.o |
163 | $(LD) -o $@ ssh-pkcs11-helper.o ssh-pkcs11.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 163 | $(LD) -o $@ ssh-pkcs11-helper.o ssh-pkcs11.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) |
164 | 164 | ||
165 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o roaming_dummy.o | 165 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o roaming_dummy.o |
166 | $(LD) -o $@ ssh-keyscan.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) | 166 | $(LD) -o $@ ssh-keyscan.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) |