summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in26
1 files changed, 16 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in
index eb05e9456..ff978b74f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,7 +19,7 @@ LIBWRAP=@LIBWRAP@
19AR=@AR@ 19AR=@AR@
20RANLIB=@RANLIB@ 20RANLIB=@RANLIB@
21INSTALL=@INSTALL@ 21INSTALL=@INSTALL@
22LFLAGS=@LDFLAGS@ 22LDFLAGS=-L. @LDFLAGS@
23 23
24GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui` 24GNOME_CFLAGS=`gnome-config --cflags gnome gnomeui`
25GNOME_LIBS=`gnome-config --libs gnome gnomeui` 25GNOME_LIBS=`gnome-config --libs gnome gnomeui`
@@ -33,37 +33,43 @@ OBJS= atomicio.o authfd.o authfile.o auth-krb4.o auth-passwd.o \
33 packet.o pty.o radix.o readconf.o readpass.o rsa.o servconf.o \ 33 packet.o pty.o radix.o readconf.o readpass.o rsa.o servconf.o \
34 serverloop.o sshconnect.o tildexpand.o ttymodes.o uidswap.o \ 34 serverloop.o sshconnect.o tildexpand.o ttymodes.o uidswap.o \
35 xmalloc.o 35 xmalloc.o
36all: $(OBJS) $(TARGETS)
37 36
38libssh.a: atomicio.o authfd.o authfile.o bsd-daemon.o bsd-mktemp.o \ 37LIBOBJS= atomicio.o authfd.o authfile.o bsd-daemon.o bsd-mktemp.o \
39 bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bufaux.o \ 38 bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bufaux.o \
40 buffer.o canohost.o channels.o cipher.o compat.o \ 39 buffer.o canohost.o channels.o cipher.o compat.o \
41 compress.o crc32.o deattack.o fingerprint.o helper.o \ 40 compress.o crc32.o deattack.o fingerprint.o helper.o \
42 hostfile.o log.o match.o mpaux.o nchan.o packet.o \ 41 hostfile.o log.o match.o mpaux.o nchan.o packet.o \
43 radix.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o \ 42 radix.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o \
44 xmalloc.o 43 xmalloc.o
45 $(AR) rv $@ $^ 44
45all: $(OBJS) $(TARGETS)
46
47libssh.a: $(LIBOBJS)
48 $(AR) rv $@ $(LIBOBJS)
46 $(RANLIB) $@ 49 $(RANLIB) $@
47 50
48ssh: ssh.o sshconnect.o log-client.o readconf.o clientloop.o libssh.a 51ssh: ssh.o sshconnect.o log-client.o readconf.o clientloop.o libssh.a
49 $(CC) -o $@ $^ $(LFLAGS) $(LIBS) 52 $(CC) -o $@ ssh.o sshconnect.o log-client.o readconf.o \
53 clientloop.o $(LDFLAGS) -lssh $(LIBS)
50 54
51sshd: sshd.o auth-rhosts.o auth-krb4.o auth-passwd.o auth-rsa.o \ 55sshd: sshd.o auth-rhosts.o auth-krb4.o auth-passwd.o auth-rsa.o \
52 auth-rh-rsa.o pty.o log-server.o login.o servconf.o serverloop.o \ 56 auth-rh-rsa.o pty.o log-server.o login.o servconf.o serverloop.o \
53 bsd-login.o md5crypt.o libssh.a 57 bsd-login.o md5crypt.o libssh.a
54 $(CC) -o $@ $^ $(LFLAGS) $(LIBS) $(LIBWRAP) 58 $(CC) -o $@ sshd.o auth-rhosts.o auth-krb4.o auth-passwd.o \
59 auth-rsa.o auth-rh-rsa.o pty.o log-server.o login.o servconf.o \
60 serverloop.o bsd-login.o md5crypt.o $(LDFLAGS) -lssh $(LIBS) $(LIBWRAP)
55 61
56scp: scp.o libssh.a 62scp: scp.o libssh.a
57 $(CC) -o $@ $^ $(LFLAGS) $(LIBS) 63 $(CC) -o $@ scp.o $(LDFLAGS) -lssh $(LIBS)
58 64
59ssh-add: ssh-add.o log-client.o libssh.a 65ssh-add: ssh-add.o log-client.o libssh.a
60 $(CC) -o $@ $^ $(LFLAGS) $(LIBS) 66 $(CC) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh $(LIBS)
61 67
62ssh-agent: ssh-agent.o log-client.o libssh.a 68ssh-agent: ssh-agent.o log-client.o libssh.a
63 $(CC) -o $@ $^ $(LFLAGS) $(LIBS) 69 $(CC) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh $(LIBS)
64 70
65ssh-keygen: ssh-keygen.o log-client.o libssh.a 71ssh-keygen: ssh-keygen.o log-client.o libssh.a
66 $(CC) -o $@ $^ $(LFLAGS) $(LIBS) 72 $(CC) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh $(LIBS)
67 73
68gnome-ssh-askpass: gnome-ssh-askpass.c 74gnome-ssh-askpass: gnome-ssh-askpass.c
69 $(CC) $(CFLAGS) $(GNOME_CFLAGS) -o $@ gnome-ssh-askpass.c $(GNOME_LIBS) 75 $(CC) $(CFLAGS) $(GNOME_CFLAGS) -o $@ gnome-ssh-askpass.c $(GNOME_LIBS)