diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/Makefile.in b/Makefile.in index 7eb84ce63..f8a0ee291 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -29,12 +29,13 @@ INSTALL=@INSTALL@ | |||
29 | PERL=@PERL@ | 29 | PERL=@PERL@ |
30 | ENT=@ENT@ | 30 | ENT=@ENT@ |
31 | LDFLAGS=-L. @LDFLAGS@ | 31 | LDFLAGS=-L. @LDFLAGS@ |
32 | EXEEXT=@EXEEXT@ | ||
32 | 33 | ||
33 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ | 34 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ |
34 | 35 | ||
35 | TARGETS=ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server $(EXTRA_TARGETS) | 36 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) $(EXTRA_TARGETS) |
36 | 37 | ||
37 | LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o dispatch.o dsa.o hmac.o hostfile.o key.o kex.o log.o match.o mpaux.o nchan.o packet.o radix.o entropy.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o util.o uuencode.o xmalloc.o | 38 | LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o cygwin_util.o deattack.o dispatch.o dsa.o hmac.o hostfile.o key.o kex.o log.o match.o mpaux.o nchan.o packet.o radix.o entropy.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o util.o uuencode.o xmalloc.o |
38 | 39 | ||
39 | LIBOPENBSD_COMPAT_OBJS=bsd-arc4random.o bsd-base64.o bsd-bindresvport.o bsd-daemon.o bsd-inet_aton.o bsd-inet_ntoa.o bsd-misc.o bsd-mktemp.o bsd-rresvport.o bsd-setenv.o bsd-sigaction.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bsd-strsep.o fake-getaddrinfo.o fake-getnameinfo.o next-posix.o | 40 | LIBOPENBSD_COMPAT_OBJS=bsd-arc4random.o bsd-base64.o bsd-bindresvport.o bsd-daemon.o bsd-inet_aton.o bsd-inet_ntoa.o bsd-misc.o bsd-mktemp.o bsd-rresvport.o bsd-setenv.o bsd-sigaction.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bsd-strsep.o fake-getaddrinfo.o fake-getnameinfo.o next-posix.o |
40 | 41 | ||
@@ -68,25 +69,25 @@ libssh.a: $(LIBSSH_OBJS) | |||
68 | $(AR) rv $@ $(LIBSSH_OBJS) | 69 | $(AR) rv $@ $(LIBSSH_OBJS) |
69 | $(RANLIB) $@ | 70 | $(RANLIB) $@ |
70 | 71 | ||
71 | ssh: libopenbsd-compat.a libssh.a $(SSHOBJS) | 72 | ssh$(EXEEXT): libopenbsd-compat.a libssh.a $(SSHOBJS) |
72 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 73 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
73 | 74 | ||
74 | sshd: libssh.a libopenbsd-compat.a $(SSHDOBJS) | 75 | sshd$(EXEEXT): libssh.a libopenbsd-compat.a $(SSHDOBJS) |
75 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 76 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
76 | 77 | ||
77 | scp: libopenbsd-compat.a libssh.a scp.o | 78 | scp$(EXEEXT): libopenbsd-compat.a libssh.a scp.o |
78 | $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 79 | $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
79 | 80 | ||
80 | ssh-add: libopenbsd-compat.a libssh.a ssh-add.o log-client.o | 81 | ssh-add$(EXEEXT): libopenbsd-compat.a libssh.a ssh-add.o log-client.o |
81 | $(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 82 | $(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
82 | 83 | ||
83 | ssh-agent: libopenbsd-compat.a libssh.a ssh-agent.o log-client.o | 84 | ssh-agent$(EXEEXT): libopenbsd-compat.a libssh.a ssh-agent.o log-client.o |
84 | $(LD) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 85 | $(LD) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
85 | 86 | ||
86 | ssh-keygen: libopenbsd-compat.a libssh.a ssh-keygen.o log-client.o | 87 | ssh-keygen$(EXEEXT): libopenbsd-compat.a libssh.a ssh-keygen.o log-client.o |
87 | $(LD) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 88 | $(LD) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
88 | 89 | ||
89 | sftp-server: libopenbsd-compat.a libssh.a sftp-server.o log-server.o | 90 | sftp-server$(EXEEXT): libopenbsd-compat.a libssh.a sftp-server.o log-server.o |
90 | $(LD) -o $@ sftp-server.o log-server.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 91 | $(LD) -o $@ sftp-server.o log-server.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
91 | 92 | ||
92 | # test driver for the loginrec code - not built by default | 93 | # test driver for the loginrec code - not built by default |
@@ -142,7 +143,7 @@ install-files: | |||
142 | $(INSTALL) -m 644 sshd.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 | 143 | $(INSTALL) -m 644 sshd.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 |
143 | $(INSTALL) -m 644 sftp-server.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 144 | $(INSTALL) -m 644 sftp-server.[08].out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
144 | -rm -f $(DESTDIR)$(bindir)/slogin | 145 | -rm -f $(DESTDIR)$(bindir)/slogin |
145 | ln -s ssh $(DESTDIR)$(bindir)/slogin | 146 | ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin |
146 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 147 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
147 | ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 148 | ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
148 | if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config -a ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ | 149 | if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_config -a ! -f $(DESTDIR)$(sysconfdir)/sshd_config ]; then \ |
@@ -155,7 +156,7 @@ install-files: | |||
155 | $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ | 156 | $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ |
156 | fi | 157 | fi |
157 | 158 | ||
158 | host-key: ssh-keygen | 159 | host-key: ssh-keygen$(EXEEXT) |
159 | if [ -z "$(DESTDIR)" ] ; then \ | 160 | if [ -z "$(DESTDIR)" ] ; then \ |
160 | if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \ | 161 | if [ -f "$(DESTDIR)$(sysconfdir)/ssh_host_key" ] ; then \ |
161 | echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \ | 162 | echo "$(DESTDIR)$(sysconfdir)/ssh_host_key already exists, skipping." ; \ |
@@ -169,7 +170,7 @@ host-key: ssh-keygen | |||
169 | fi ; \ | 170 | fi ; \ |
170 | fi ; | 171 | fi ; |
171 | 172 | ||
172 | host-key-force: ssh-keygen | 173 | host-key-force: ssh-keygen$(EXEEXT) |
173 | ./ssh-keygen -b 1024 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" | 174 | ./ssh-keygen -b 1024 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" |
174 | ./ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" | 175 | ./ssh-keygen -d -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" |
175 | 176 | ||
@@ -186,12 +187,12 @@ uninstallall: uninstall | |||
186 | -rmdir $(DESTDIR)$(libexecdir) | 187 | -rmdir $(DESTDIR)$(libexecdir) |
187 | 188 | ||
188 | uninstall: | 189 | uninstall: |
189 | -rm -f $(DESTDIR)$(bindir)/ssh | 190 | -rm -f $(DESTDIR)$(bindir)/ssh$(EXEEXT) |
190 | -rm -f $(DESTDIR)$(bindir)/scp | 191 | -rm -f $(DESTDIR)$(bindir)/scp$(EXEEXT) |
191 | -rm -f $(DESTDIR)$(bindir)/ssh-add | 192 | -rm -f $(DESTDIR)$(bindir)/ssh-add$(EXEEXT) |
192 | -rm -f $(DESTDIR)$(bindir)/ssh-agent | 193 | -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT) |
193 | -rm -f $(DESTDIR)$(bindir)/ssh-keygen | 194 | -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) |
194 | -rm -f $(DESTDIR)$(sbindir)/sshd | 195 | -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) |
195 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 | 196 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 |
196 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 | 197 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 |
197 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 | 198 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 |