diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index c3cd580ea..8ea71915a 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -33,9 +33,9 @@ SSH_MODE= @SSHMODE@ | |||
33 | 33 | ||
34 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ | 34 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ |
35 | 35 | ||
36 | @NO_SFTP@SFTP-SERVER=sftp-server$(EXEEXT) | 36 | @NO_SFTP@SFTP_PROGS=sftp-server$(EXEEXT) sftp$(EXEEXT) |
37 | 37 | ||
38 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) $(SFTP-SERVER) | 38 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) $(SFTP_PROGS) |
39 | 39 | ||
40 | LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o cli.o compat.o compress.o crc32.o deattack.o dispatch.o hmac.o hostfile.o key.o kex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o | 40 | LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o cli.o compat.o compress.o crc32.o deattack.o dispatch.o hmac.o hostfile.o key.o kex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o |
41 | 41 | ||
@@ -43,8 +43,8 @@ SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o | |||
43 | 43 | ||
44 | SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth-chall.o auth2-chall.o auth-rhosts.o auth-options.o auth-krb4.o auth-pam.o auth2-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o dh.o pty.o log-server.o login.o loginrec.o servconf.o serverloop.o md5crypt.o session.o groupaccess.o | 44 | SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth-chall.o auth2-chall.o auth-rhosts.o auth-options.o auth-krb4.o auth-pam.o auth2-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o dh.o pty.o log-server.o login.o loginrec.o servconf.o serverloop.o md5crypt.o session.o groupaccess.o |
45 | 45 | ||
46 | TROFFMAN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 | 46 | TROFFMAN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 |
47 | CATMAN = scp.0 ssh-add.0 ssh-agent.0 ssh-keygen.0 ssh-keyscan.0 ssh.0 sshd.0 sftp-server.0 | 47 | CATMAN = scp.0 ssh-add.0 ssh-agent.0 ssh-keygen.0 ssh-keyscan.0 ssh.0 sshd.0 sftp-server.0 sftp.1 |
48 | MANPAGES = @MANTYPE@ | 48 | MANPAGES = @MANTYPE@ |
49 | 49 | ||
50 | CONFIGFILES=sshd_config ssh_config primes | 50 | CONFIGFILES=sshd_config ssh_config primes |
@@ -105,8 +105,12 @@ ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o log-client.o | |||
105 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a log-client.o ssh-keyscan.o | 105 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a log-client.o ssh-keyscan.o |
106 | $(LD) -o $@ ssh-keyscan.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 106 | $(LD) -o $@ ssh-keyscan.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
107 | 107 | ||
108 | sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp-server.o log-server.o | 108 | sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp-server.o sftp-common.o log-server.o |
109 | $(LD) -o $@ sftp-server.o log-server.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 109 | $(LD) -o $@ sftp-server.o sftp-common.o log-server.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
110 | |||
111 | # XXX: need to -lssh twice here! | ||
112 | sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-int.o sftp-common.o log-client.o | ||
113 | $(LD) -o $@ sftp.o sftp-client.o sftp-common.o sftp-int.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) | ||
110 | 114 | ||
111 | # test driver for the loginrec code - not built by default | 115 | # test driver for the loginrec code - not built by default |
112 | logintest: logintest.o $(LIBCOMPAT) libssh.a log-client.o loginrec.o | 116 | logintest: logintest.o $(LIBCOMPAT) libssh.a log-client.o loginrec.o |
@@ -156,6 +160,7 @@ install-files: | |||
156 | $(INSTALL) -m 0755 -s ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen | 160 | $(INSTALL) -m 0755 -s ssh-keygen $(DESTDIR)$(bindir)/ssh-keygen |
157 | $(INSTALL) -m 0775 -s ssh-keyscan $(DESTDIR)$(bindir)/ssh-keyscan | 161 | $(INSTALL) -m 0775 -s ssh-keyscan $(DESTDIR)$(bindir)/ssh-keyscan |
158 | $(INSTALL) -m 0755 -s sshd $(DESTDIR)$(sbindir)/sshd | 162 | $(INSTALL) -m 0755 -s sshd $(DESTDIR)$(sbindir)/sshd |
163 | @NO_SFTP@$$(INSTALL) -m 0755 -s sftp $(DESTDIR)$(bindir)/sftp | ||
159 | @NO_SFTP@$(INSTALL) -m 0755 -s sftp-server $(DESTDIR)$(libexecdir)/sftp-server | 164 | @NO_SFTP@$(INSTALL) -m 0755 -s sftp-server $(DESTDIR)$(libexecdir)/sftp-server |
160 | $(INSTALL) -m 644 ssh.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 | 165 | $(INSTALL) -m 644 ssh.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 |
161 | $(INSTALL) -m 644 scp.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 | 166 | $(INSTALL) -m 644 scp.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 |
@@ -164,6 +169,7 @@ install-files: | |||
164 | $(INSTALL) -m 644 ssh-keygen.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 | 169 | $(INSTALL) -m 644 ssh-keygen.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 |
165 | $(INSTALL) -m 644 ssh-keyscan.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 | 170 | $(INSTALL) -m 644 ssh-keyscan.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 |
166 | $(INSTALL) -m 644 sshd.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 | 171 | $(INSTALL) -m 644 sshd.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 |
172 | @NO_SFTP@$$(INSTALL) -m 644 sftp.[01].out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 | ||
167 | @NO_SFTP@$(INSTALL) -m 644 sftp-server.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 173 | @NO_SFTP@$(INSTALL) -m 644 sftp-server.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
168 | -rm -f $(DESTDIR)$(bindir)/slogin | 174 | -rm -f $(DESTDIR)$(bindir)/slogin |
169 | ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin | 175 | ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin |
@@ -241,6 +247,7 @@ uninstall: | |||
241 | -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT) | 247 | -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT) |
242 | -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) | 248 | -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) |
243 | -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) | 249 | -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) |
250 | -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT) | ||
244 | -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) | 251 | -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) |
245 | -rm -r $(DESTDIR)$(libexecdir)/sftp-server$(EXEEXT) | 252 | -rm -r $(DESTDIR)$(libexecdir)/sftp-server$(EXEEXT) |
246 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 | 253 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 |
@@ -248,6 +255,7 @@ uninstall: | |||
248 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 | 255 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 |
249 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1 | 256 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1 |
250 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 | 257 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 |
258 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 | ||
251 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 | 259 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 |
252 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 | 260 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 |
253 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 261 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |