diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 947eec075..257f73cc1 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -27,6 +27,7 @@ SFTP_SERVER=$(libexecdir)/sftp-server | |||
27 | SSH_KEYSIGN=$(libexecdir)/ssh-keysign | 27 | SSH_KEYSIGN=$(libexecdir)/ssh-keysign |
28 | SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper | 28 | SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper |
29 | RAND_HELPER=$(libexecdir)/ssh-rand-helper | 29 | RAND_HELPER=$(libexecdir)/ssh-rand-helper |
30 | SSH_DATADIR=$(datadir)/ssh | ||
30 | PRIVSEP_PATH=@PRIVSEP_PATH@ | 31 | PRIVSEP_PATH=@PRIVSEP_PATH@ |
31 | SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ | 32 | SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ |
32 | STRIP_OPT=@STRIP_OPT@ | 33 | STRIP_OPT=@STRIP_OPT@ |
@@ -39,13 +40,15 @@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \ | |||
39 | -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \ | 40 | -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \ |
40 | -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ | 41 | -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ |
41 | -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" \ | 42 | -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" \ |
42 | -DSSH_RAND_HELPER=\"$(RAND_HELPER)\" | 43 | -DSSH_RAND_HELPER=\"$(RAND_HELPER)\" \ |
44 | -D_PATH_SSH_DATADIR=\"$(SSH_DATADIR)\" | ||
43 | 45 | ||
44 | CC=@CC@ | 46 | CC=@CC@ |
45 | LD=@LD@ | 47 | LD=@LD@ |
46 | CFLAGS=@CFLAGS@ | 48 | CFLAGS=@CFLAGS@ |
47 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ | 49 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ |
48 | LIBS=@LIBS@ | 50 | LIBS=@LIBS@ |
51 | SSHLIBS=@SSHLIBS@ | ||
49 | SSHDLIBS=@SSHDLIBS@ | 52 | SSHDLIBS=@SSHDLIBS@ |
50 | LIBEDIT=@LIBEDIT@ | 53 | LIBEDIT=@LIBEDIT@ |
51 | AR=@AR@ | 54 | AR=@AR@ |
@@ -63,7 +66,7 @@ MANFMT=@MANFMT@ | |||
63 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ | 66 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ |
64 | INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ | 67 | INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ |
65 | 68 | ||
66 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT) | 69 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT) ssh-vulnkey$(EXEEXT) |
67 | 70 | ||
68 | LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ | 71 | LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ |
69 | canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \ | 72 | canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \ |
@@ -96,8 +99,8 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | |||
96 | sftp-server.o sftp-common.o \ | 99 | sftp-server.o sftp-common.o \ |
97 | roaming_common.o roaming_serv.o | 100 | roaming_common.o roaming_serv.o |
98 | 101 | ||
99 | MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out | 102 | MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out ssh-pkcs11-helper.8.out ssh-vulnkey.1.out sshd_config.5.out ssh_config.5.out |
100 | MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5 | 103 | MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 ssh-pkcs11-helper.8 ssh-vulnkey.1 sshd_config.5 ssh_config.5 |
101 | MANTYPE = @MANTYPE@ | 104 | MANTYPE = @MANTYPE@ |
102 | 105 | ||
103 | CONFIGFILES=sshd_config.out ssh_config.out moduli.out | 106 | CONFIGFILES=sshd_config.out ssh_config.out moduli.out |
@@ -143,7 +146,7 @@ libssh.a: $(LIBSSH_OBJS) | |||
143 | $(RANLIB) $@ | 146 | $(RANLIB) $@ |
144 | 147 | ||
145 | ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) | 148 | ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) |
146 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 149 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) |
147 | 150 | ||
148 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) | 151 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) |
149 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) | 152 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) |
@@ -178,6 +181,9 @@ sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glo | |||
178 | ssh-rand-helper${EXEEXT}: $(LIBCOMPAT) libssh.a ssh-rand-helper.o | 181 | ssh-rand-helper${EXEEXT}: $(LIBCOMPAT) libssh.a ssh-rand-helper.o |
179 | $(LD) -o $@ ssh-rand-helper.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 182 | $(LD) -o $@ ssh-rand-helper.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
180 | 183 | ||
184 | ssh-vulnkey$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-vulnkey.o | ||
185 | $(LD) -o $@ ssh-vulnkey.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | ||
186 | |||
181 | # test driver for the loginrec code - not built by default | 187 | # test driver for the loginrec code - not built by default |
182 | logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o | 188 | logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o |
183 | $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS) | 189 | $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS) |
@@ -272,6 +278,7 @@ install-files: | |||
272 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT) $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) | 278 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT) $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) |
273 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT) $(DESTDIR)$(bindir)/sftp$(EXEEXT) | 279 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT) $(DESTDIR)$(bindir)/sftp$(EXEEXT) |
274 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT) $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) | 280 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT) $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) |
281 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-vulnkey$(EXEEXT) $(DESTDIR)$(bindir)/ssh-vulnkey$(EXEEXT) | ||
275 | $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 | 282 | $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 |
276 | $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 | 283 | $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 |
277 | $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 | 284 | $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 |
@@ -282,6 +289,7 @@ install-files: | |||
282 | $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5 | 289 | $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5 |
283 | $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5 | 290 | $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5 |
284 | $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 | 291 | $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 |
292 | ln -s ../$(mansubdir)8/sshd.8 $(DESTDIR)$(mandir)/$(mansubdir)5/authorized_keys.5 | ||
285 | if [ ! -z "$(INSTALL_SSH_RAND_HELPER)" ]; then \ | 293 | if [ ! -z "$(INSTALL_SSH_RAND_HELPER)" ]; then \ |
286 | $(INSTALL) -m 644 ssh-rand-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 ; \ | 294 | $(INSTALL) -m 644 ssh-rand-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 ; \ |
287 | fi | 295 | fi |
@@ -289,10 +297,11 @@ install-files: | |||
289 | $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 297 | $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
290 | $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 | 298 | $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 |
291 | $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | 299 | $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 |
300 | $(INSTALL) -m 644 ssh-vulnkey.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-vulnkey.1 | ||
292 | -rm -f $(DESTDIR)$(bindir)/slogin | 301 | -rm -f $(DESTDIR)$(bindir)/slogin |
293 | ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin | 302 | ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin |
294 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 303 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
295 | ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 304 | ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
296 | 305 | ||
297 | install-sysconf: | 306 | install-sysconf: |
298 | if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ | 307 | if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ |
@@ -378,6 +387,7 @@ uninstall: | |||
378 | -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT) | 387 | -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT) |
379 | -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) | 388 | -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) |
380 | -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) | 389 | -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) |
390 | -rm -f $(DESTDIR)$(bindir)/ssh-vulnkey$(EXEEXT) | ||
381 | -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT) | 391 | -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT) |
382 | -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) | 392 | -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) |
383 | -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) | 393 | -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) |
@@ -391,6 +401,7 @@ uninstall: | |||
391 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 | 401 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 |
392 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 | 402 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 |
393 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 | 403 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 |
404 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-vulnkey.1 | ||
394 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 | 405 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 |
395 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 | 406 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 |
396 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 407 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |