diff options
author | Damien Miller <djm@mindrot.org> | 1999-12-13 08:27:33 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-12-13 08:27:33 +1100 |
commit | c6b3bbe2b991f4f87ca1f8214f43c13a5a73f385 (patch) | |
tree | 5eadc1e35464be6ec748793060d92b12fa637052 /Makefile.in | |
parent | 4e0dbd07cf1021897210c11a16fd05f207d95b8e (diff) |
- Fix compilation on systems with AFS. Reported by
aloomis@glue.umd.edu
- Fix installation on Solaris. Reported by
Gordon Rowell <gordonr@gormand.com.au>
- Fix gccisms (__attribute__ and inline). Report by edgy@us.ibm.com,
patch from Markus Friedl <markus.friedl@informatik.uni-erlangen.de>
- Auto-locate xauth. Patch from David Agraz <dagraz@jahoopa.com>
- Compile fix from David Agraz <dagraz@jahoopa.com>
- Avoid compiler warning in bsd-snprintf.c
- Added pam_limits.so to default PAM config. Suggested by
Jim Knoble <jmknoble@pobox.com>
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/Makefile.in b/Makefile.in index 7148c50cd..f72867470 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -24,14 +24,15 @@ LFLAGS=@LDFLAGS@ | |||
24 | GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui` | 24 | GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui` |
25 | GNOME_LIBS=`gnome-config --libs gnome gnomeui` | 25 | GNOME_LIBS=`gnome-config --libs gnome gnomeui` |
26 | 26 | ||
27 | OBJS= atomicio.o authfd.o authfile.o auth-passwd.o auth-rhosts.o \ | 27 | OBJS= atomicio.o authfd.o authfile.o auth-krb4.o auth-passwd.o \ |
28 | auth-rh-rsa.o auth-rsa.o auth-skey.o bsd-daemon.o bsd-login.o \ | 28 | auth-rhosts.o auth-rh-rsa.o auth-rsa.o auth-skey.o bsd-daemon.o \ |
29 | bsd-mktemp.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bufaux.o \ | 29 | bsd-login.o bsd-mktemp.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o |
30 | buffer.o canohost.o channels.o cipher.o clientloop.o compress.o \ | 30 | bufaux.o buffer.o canohost.o channels.o cipher.o clientloop.o \ |
31 | crc32.o deattack.o helper.o helper.o hostfile.o log-client.o \ | 31 | compress.o crc32.o deattack.o helper.o helper.o hostfile.o \ |
32 | login.o log-server.o match.o md5crypt.o mpaux.o packet.o pty.o \ | 32 | log-client.o login.o log-server.o match.o md5crypt.o mpaux.o \ |
33 | readconf.o readpass.o rsa.o servconf.o serverloop.o \ | 33 | packet.o pty.o radix.o readconf.o readpass.o rsa.o servconf.o \ |
34 | sshconnect.o tildexpand.o ttymodes.o uidswap.o xmalloc.o | 34 | serverloop.o sshconnect.o tildexpand.o ttymodes.o uidswap.o \ |
35 | xmalloc.o | ||
35 | all: $(OBJS) $(TARGETS) | 36 | all: $(OBJS) $(TARGETS) |
36 | 37 | ||
37 | libssh.a: atomicio.o authfd.o authfile.o bsd-daemon.o bsd-mktemp.o \ | 38 | libssh.a: atomicio.o authfd.o authfile.o bsd-daemon.o bsd-mktemp.o \ |
@@ -39,16 +40,17 @@ libssh.a: atomicio.o authfd.o authfile.o bsd-daemon.o bsd-mktemp.o \ | |||
39 | buffer.o canohost.o channels.o cipher.o compat.o \ | 40 | buffer.o canohost.o channels.o cipher.o compat.o \ |
40 | compress.o crc32.o deattack.o fingerprint.o helper.o \ | 41 | compress.o crc32.o deattack.o fingerprint.o helper.o \ |
41 | hostfile.o log.o match.o mpaux.o nchan.o packet.o \ | 42 | hostfile.o log.o match.o mpaux.o nchan.o packet.o \ |
42 | readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o xmalloc.o | 43 | radix.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o \ |
44 | xmalloc.o | ||
43 | $(AR) rv $@ $^ | 45 | $(AR) rv $@ $^ |
44 | $(RANLIB) $@ | 46 | $(RANLIB) $@ |
45 | 47 | ||
46 | ssh: ssh.o sshconnect.o log-client.o readconf.o clientloop.o libssh.a | 48 | ssh: ssh.o sshconnect.o log-client.o readconf.o clientloop.o libssh.a |
47 | $(CC) -o $@ $^ $(LFLAGS) $(LIBS) | 49 | $(CC) -o $@ $^ $(LFLAGS) $(LIBS) |
48 | 50 | ||
49 | sshd: sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | 51 | sshd: sshd.o auth-rhosts.o auth-krb4.o auth-passwd.o auth-rsa.o \ |
50 | pty.o log-server.o login.o servconf.o serverloop.o bsd-login.o \ | 52 | auth-rh-rsa.o pty.o log-server.o login.o servconf.o serverloop.o \ |
51 | md5crypt.o libssh.a | 53 | bsd-login.o md5crypt.o libssh.a |
52 | $(CC) -o $@ $^ $(LFLAGS) $(LIBS) $(LIBWRAP) | 54 | $(CC) -o $@ $^ $(LFLAGS) $(LIBS) $(LIBWRAP) |
53 | 55 | ||
54 | scp: scp.o libssh.a | 56 | scp: scp.o libssh.a |
@@ -81,27 +83,27 @@ install: all | |||
81 | $(INSTALL) -s ssh-agent $(bindir)/ssh-agent | 83 | $(INSTALL) -s ssh-agent $(bindir)/ssh-agent |
82 | $(INSTALL) -s ssh-keygen $(bindir)/ssh-keygen | 84 | $(INSTALL) -s ssh-keygen $(bindir)/ssh-keygen |
83 | $(INSTALL) -s sshd $(sbindir)/sshd | 85 | $(INSTALL) -s sshd $(sbindir)/sshd |
84 | $(INSTALL) -m644 ssh.1 $(mandir)/man1/ssh.1 | 86 | $(INSTALL) -m 644 ssh.1 $(mandir)/man1/ssh.1 |
85 | $(INSTALL) -m644 scp.1 $(mandir)/man1/scp.1 | 87 | $(INSTALL) -m 644 scp.1 $(mandir)/man1/scp.1 |
86 | $(INSTALL) -m644 ssh-add.1 $(mandir)/man1/ssh-add.1 | 88 | $(INSTALL) -m 644 ssh-add.1 $(mandir)/man1/ssh-add.1 |
87 | $(INSTALL) -m644 ssh-agent.1 $(mandir)/man1/ssh-agent.1 | 89 | $(INSTALL) -m 644 ssh-agent.1 $(mandir)/man1/ssh-agent.1 |
88 | $(INSTALL) -m644 ssh-keygen.1 $(mandir)/man1/ssh-keygen.1 | 90 | $(INSTALL) -m 644 ssh-keygen.1 $(mandir)/man1/ssh-keygen.1 |
89 | $(INSTALL) -m644 sshd.8 $(mandir)/man8/sshd.8 | 91 | $(INSTALL) -m 644 sshd.8 $(mandir)/man8/sshd.8 |
90 | -rm -f $(bindir)/slogin | 92 | -rm -f $(bindir)/slogin |
91 | ln -s ssh $(bindir)/slogin | 93 | ln -s ssh $(bindir)/slogin |
92 | -rm -f $(mandir)/man1/slogin.1 | 94 | -rm -f $(mandir)/man1/slogin.1 |
93 | ln -s ssh.1 $(mandir)/man1/slogin.1 | 95 | ln -s ssh.1 $(mandir)/man1/slogin.1 |
94 | 96 | ||
95 | $(INSTALL) -d $(libexecdir) ; | ||
96 | $(INSTALL) -d $(libexecdir)/ssh ; | ||
97 | if [ ! -z "@GNOME_ASKPASS@" ] ; then \ | 97 | if [ ! -z "@GNOME_ASKPASS@" ] ; then \ |
98 | $(INSTALL) -d $(libexecdir) ; | ||
99 | $(INSTALL) -d $(libexecdir)/ssh ; | ||
98 | $(INSTALL) -s @GNOME_ASKPASS@ ${ASKPASS_PROGRAM} ; \ | 100 | $(INSTALL) -s @GNOME_ASKPASS@ ${ASKPASS_PROGRAM} ; \ |
99 | fi | 101 | fi |
100 | 102 | ||
101 | if [ ! -f $(sysconfdir)/ssh_config -a ! -f $(sysconfdir)/sshd_config ]; then \ | 103 | if [ ! -f $(sysconfdir)/ssh_config -a ! -f $(sysconfdir)/sshd_config ]; then \ |
102 | $(INSTALL) -d $(sysconfdir); \ | 104 | $(INSTALL) -d $(sysconfdir); \ |
103 | $(INSTALL) -m644 ssh_config $(sysconfdir)/ssh_config; \ | 105 | $(INSTALL) -m 644 ssh_config $(sysconfdir)/ssh_config; \ |
104 | $(INSTALL) -m644 sshd_config $(sysconfdir)/sshd_config; \ | 106 | $(INSTALL) -m 644 sshd_config $(sysconfdir)/sshd_config; \ |
105 | fi | 107 | fi |
106 | 108 | ||
107 | uninstallall: uninstall | 109 | uninstallall: uninstall |
@@ -130,7 +132,6 @@ uninstall: | |||
130 | -rm -f $(mandir)/man8/sshd.8 | 132 | -rm -f $(mandir)/man8/sshd.8 |
131 | -rm -f $(bindir)/slogin | 133 | -rm -f $(bindir)/slogin |
132 | -rm -f $(mandir)/man1/slogin.1 | 134 | -rm -f $(mandir)/man1/slogin.1 |
133 | -rm -f $(mandir)/man1/slogin.1 | ||
134 | -rm -f ${ASKPASS_PROGRAM} | 135 | -rm -f ${ASKPASS_PROGRAM} |
135 | -rmdir $(libexecdir)/ssh ; | 136 | -rmdir $(libexecdir)/ssh ; |
136 | 137 | ||