diff options
| author | Colin Watson <cjwatson@debian.org> | 2010-08-23 22:56:08 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2010-08-23 22:56:08 +0100 |
| commit | 31e30b835fd9695d3b6647cab4867001b092e28f (patch) | |
| tree | 138e715c25661825457c7280cd66e3f4853d474c /Makefile.in | |
| parent | 78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (diff) | |
| parent | 43094ebf14c9b16f1ea398bc5b65a7335e947288 (diff) | |
merge 5.6p1
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 83237a333..8678a1dc5 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $Id: Makefile.in,v 1.309 2010/03/13 21:41:34 djm Exp $ | 1 | # $Id: Makefile.in,v 1.310 2010/05/12 06:51:39 dtucker 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 -lssh $(LIBS) | 163 | $(LD) -o $@ ssh-pkcs11-helper.o ssh-pkcs11.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(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) |