summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in23
1 files changed, 12 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in
index 063fa5c70..91eb81efd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -77,39 +77,40 @@ $(LIBOPENBSD_COMPAT_OBJS): config.h
77.c.o: 77.c.o:
78 $(CC) $(CFLAGS) $(CPPFLAGS) -c $< 78 $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
79 79
80libopenbsd-compat.a: 80LIBCOMPAT=openbsd-compat/libopenbsd-compat.a
81 (cd openbsd-compat; make) 81$(LIBCOMPAT):
82 (cd `dirname $@`; make)
82 83
83libssh.a: $(LIBSSH_OBJS) 84libssh.a: $(LIBSSH_OBJS)
84 $(AR) rv $@ $(LIBSSH_OBJS) 85 $(AR) rv $@ $(LIBSSH_OBJS)
85 $(RANLIB) $@ 86 $(RANLIB) $@
86 87
87ssh$(EXEEXT): libopenbsd-compat.a libssh.a $(SSHOBJS) 88ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)
88 $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 89 $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
89 90
90sshd$(EXEEXT): libssh.a libopenbsd-compat.a $(SSHDOBJS) 91sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)
91 $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 92 $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
92 93
93scp$(EXEEXT): libopenbsd-compat.a libssh.a scp.o log-client.o 94scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o log-client.o
94 $(LD) -o $@ scp.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 95 $(LD) -o $@ scp.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
95 96
96ssh-add$(EXEEXT): libopenbsd-compat.a libssh.a ssh-add.o log-client.o 97ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o log-client.o
97 $(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 98 $(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
98 99
99ssh-agent$(EXEEXT): libopenbsd-compat.a libssh.a ssh-agent.o log-client.o 100ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o log-client.o
100 $(LD) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 101 $(LD) -o $@ ssh-agent.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
101 102
102ssh-keygen$(EXEEXT): libopenbsd-compat.a libssh.a ssh-keygen.o log-client.o 103ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o log-client.o
103 $(LD) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 104 $(LD) -o $@ ssh-keygen.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
104 105
105ssh-keyscan$(EXEEXT): libopenbsd-compat.a libssh.a log-client.o ssh-keyscan.o 106ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a log-client.o ssh-keyscan.o
106 $(LD) -o $@ ssh-keyscan.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 107 $(LD) -o $@ ssh-keyscan.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
107 108
108sftp-server$(EXEEXT): libopenbsd-compat.a libssh.a sftp-server.o log-server.o 109sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp-server.o log-server.o
109 $(LD) -o $@ sftp-server.o log-server.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 110 $(LD) -o $@ sftp-server.o log-server.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
110 111
111# test driver for the loginrec code - not built by default 112# test driver for the loginrec code - not built by default
112logintest: logintest.o libopenbsd-compat.a libssh.a log-client.o loginrec.o 113logintest: logintest.o $(LIBCOMPAT) libssh.a log-client.o loginrec.o
113 $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh log-client.o $(LIBS) 114 $(LD) -o $@ logintest.o $(LDFLAGS) loginrec.o -lopenbsd-compat -lssh log-client.o $(LIBS)
114 115
115$(MANPAGES) $(CONFIGFILES):: 116$(MANPAGES) $(CONFIGFILES)::