diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Makefile.in | 23 |
2 files changed, 17 insertions, 11 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20010101 | ||
2 | - (bal) Minor fix to Makefile to stop rebuilding executables if no | ||
3 | changes have occured to any of the supporting code. Patch by | ||
4 | Roumen Petrov <roumen.petrov@skalasoft.com> | ||
5 | |||
1 | 20010131 | 6 | 20010131 |
2 | - (djm) OpenBSD CVS Sync: | 7 | - (djm) OpenBSD CVS Sync: |
3 | - djm@cvs.openbsd.org 2001/01/30 15:48:53 | 8 | - djm@cvs.openbsd.org 2001/01/30 15:48:53 |
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 | ||
80 | libopenbsd-compat.a: | 80 | LIBCOMPAT=openbsd-compat/libopenbsd-compat.a |
81 | (cd openbsd-compat; make) | 81 | $(LIBCOMPAT): |
82 | (cd `dirname $@`; make) | ||
82 | 83 | ||
83 | libssh.a: $(LIBSSH_OBJS) | 84 | libssh.a: $(LIBSSH_OBJS) |
84 | $(AR) rv $@ $(LIBSSH_OBJS) | 85 | $(AR) rv $@ $(LIBSSH_OBJS) |
85 | $(RANLIB) $@ | 86 | $(RANLIB) $@ |
86 | 87 | ||
87 | ssh$(EXEEXT): libopenbsd-compat.a libssh.a $(SSHOBJS) | 88 | ssh$(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 | ||
90 | sshd$(EXEEXT): libssh.a libopenbsd-compat.a $(SSHDOBJS) | 91 | sshd$(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 | ||
93 | scp$(EXEEXT): libopenbsd-compat.a libssh.a scp.o log-client.o | 94 | scp$(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 | ||
96 | ssh-add$(EXEEXT): libopenbsd-compat.a libssh.a ssh-add.o log-client.o | 97 | ssh-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 | ||
99 | ssh-agent$(EXEEXT): libopenbsd-compat.a libssh.a ssh-agent.o log-client.o | 100 | ssh-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 | ||
102 | ssh-keygen$(EXEEXT): libopenbsd-compat.a libssh.a ssh-keygen.o log-client.o | 103 | ssh-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 | ||
105 | ssh-keyscan$(EXEEXT): libopenbsd-compat.a libssh.a log-client.o ssh-keyscan.o | 106 | ssh-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 | ||
108 | sftp-server$(EXEEXT): libopenbsd-compat.a libssh.a sftp-server.o log-server.o | 109 | sftp-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 |
112 | logintest: logintest.o libopenbsd-compat.a libssh.a log-client.o loginrec.o | 113 | logintest: 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):: |