diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index e840d958d..f7e05b22e 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,7 +40,8 @@ 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@ |
@@ -62,7 +64,7 @@ EXEEXT=@EXEEXT@ | |||
62 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ | 64 | INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ |
63 | INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ | 65 | INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ |
64 | 66 | ||
65 | 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) | 67 | 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) |
66 | 68 | ||
67 | LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ | 69 | LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \ |
68 | canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \ | 70 | canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \ |
@@ -93,8 +95,8 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | |||
93 | audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \ | 95 | audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o \ |
94 | roaming_common.o roaming_serv.o | 96 | roaming_common.o roaming_serv.o |
95 | 97 | ||
96 | 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 | 98 | 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 |
97 | 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 | 99 | 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 |
98 | MANTYPE = @MANTYPE@ | 100 | MANTYPE = @MANTYPE@ |
99 | 101 | ||
100 | CONFIGFILES=sshd_config.out ssh_config.out moduli.out | 102 | CONFIGFILES=sshd_config.out ssh_config.out moduli.out |
@@ -174,6 +176,9 @@ sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glo | |||
174 | ssh-rand-helper${EXEEXT}: $(LIBCOMPAT) libssh.a ssh-rand-helper.o | 176 | ssh-rand-helper${EXEEXT}: $(LIBCOMPAT) libssh.a ssh-rand-helper.o |
175 | $(LD) -o $@ ssh-rand-helper.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 177 | $(LD) -o $@ ssh-rand-helper.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
176 | 178 | ||
179 | ssh-vulnkey$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-vulnkey.o | ||
180 | $(LD) -o $@ ssh-vulnkey.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | ||
181 | |||
177 | # test driver for the loginrec code - not built by default | 182 | # test driver for the loginrec code - not built by default |
178 | logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o | 183 | logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o |
179 | $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS) | 184 | $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh $(LIBS) |
@@ -269,6 +274,7 @@ install-files: | |||
269 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper $(DESTDIR)$(SSH_PKCS11_HELPER) | 274 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper $(DESTDIR)$(SSH_PKCS11_HELPER) |
270 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp $(DESTDIR)$(bindir)/sftp | 275 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp $(DESTDIR)$(bindir)/sftp |
271 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server $(DESTDIR)$(SFTP_SERVER) | 276 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server $(DESTDIR)$(SFTP_SERVER) |
277 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-vulnkey $(DESTDIR)$(bindir)/ssh-vulnkey | ||
272 | $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 | 278 | $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 |
273 | $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 | 279 | $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 |
274 | $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 | 280 | $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 |
@@ -279,6 +285,7 @@ install-files: | |||
279 | $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5 | 285 | $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5 |
280 | $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5 | 286 | $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5 |
281 | $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 | 287 | $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 |
288 | ln -s ../$(mansubdir)8/sshd.8 $(DESTDIR)$(mandir)/$(mansubdir)5/authorized_keys.5 | ||
282 | if [ ! -z "$(INSTALL_SSH_RAND_HELPER)" ]; then \ | 289 | if [ ! -z "$(INSTALL_SSH_RAND_HELPER)" ]; then \ |
283 | $(INSTALL) -m 644 ssh-rand-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 ; \ | 290 | $(INSTALL) -m 644 ssh-rand-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 ; \ |
284 | fi | 291 | fi |
@@ -286,10 +293,11 @@ install-files: | |||
286 | $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 293 | $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
287 | $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 | 294 | $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 |
288 | $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | 295 | $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 |
296 | $(INSTALL) -m 644 ssh-vulnkey.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-vulnkey.1 | ||
289 | -rm -f $(DESTDIR)$(bindir)/slogin | 297 | -rm -f $(DESTDIR)$(bindir)/slogin |
290 | ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin | 298 | ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin |
291 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 299 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
292 | ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | 300 | ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 |
293 | 301 | ||
294 | install-sysconf: | 302 | install-sysconf: |
295 | if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ | 303 | if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ |
@@ -367,6 +375,7 @@ uninstall: | |||
367 | -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT) | 375 | -rm -f $(DESTDIR)$(bindir)/ssh-agent$(EXEEXT) |
368 | -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) | 376 | -rm -f $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) |
369 | -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) | 377 | -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) |
378 | -rm -f $(DESTDIR)$(bindir)/ssh-vulnkey$(EXEEXT) | ||
370 | -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT) | 379 | -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT) |
371 | -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) | 380 | -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) |
372 | -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) | 381 | -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) |
@@ -380,6 +389,7 @@ uninstall: | |||
380 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 | 389 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 |
381 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 | 390 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 |
382 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 | 391 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keyscan.1 |
392 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-vulnkey.1 | ||
383 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 | 393 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 |
384 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 | 394 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-rand-helper.8 |
385 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 395 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |