diff options
author | Damien Miller <djm@mindrot.org> | 2011-01-25 12:16:15 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-01-25 12:16:15 +1100 |
commit | 71adf127e834e215017b22d61cb4cd4b75cf8ddc (patch) | |
tree | 0f547a038e6d9f1279a4ffc5d2bb40676a709d15 /Makefile.in | |
parent | 6f8f04b860765da07938bfe1fef017b00c3a3d55 (diff) |
- (djm) [configure.ac Makefile.in ssh.c openbsd-compat/port-linux.c
openbsd-compat/port-linux.h] Move SELinux-specific code from ssh.c to
port-linux.c to avoid compilation errors. Add -lselinux to ssh when
building with SELinux support to avoid linking failure; report from
amk AT spamfence.net; ok dtucker
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 77a78aa61..d0263779b 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.320 2011/01/17 10:15:29 dtucker Exp $ | 1 | # $Id: Makefile.in,v 1.321 2011/01/25 01:16:16 djm Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -46,6 +46,7 @@ LD=@LD@ | |||
46 | CFLAGS=@CFLAGS@ | 46 | CFLAGS=@CFLAGS@ |
47 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ | 47 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ |
48 | LIBS=@LIBS@ | 48 | LIBS=@LIBS@ |
49 | SSHLIBS=@SSHLIBS@ | ||
49 | SSHDLIBS=@SSHDLIBS@ | 50 | SSHDLIBS=@SSHDLIBS@ |
50 | LIBEDIT=@LIBEDIT@ | 51 | LIBEDIT=@LIBEDIT@ |
51 | AR=@AR@ | 52 | AR=@AR@ |
@@ -142,7 +143,7 @@ libssh.a: $(LIBSSH_OBJS) | |||
142 | $(RANLIB) $@ | 143 | $(RANLIB) $@ |
143 | 144 | ||
144 | ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) | 145 | ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) |
145 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 146 | $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) |
146 | 147 | ||
147 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) | 148 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) |
148 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) | 149 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) |