summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-01-25 12:16:15 +1100
committerDamien Miller <djm@mindrot.org>2011-01-25 12:16:15 +1100
commit71adf127e834e215017b22d61cb4cd4b75cf8ddc (patch)
tree0f547a038e6d9f1279a4ffc5d2bb40676a709d15 /Makefile.in
parent6f8f04b860765da07938bfe1fef017b00c3a3d55 (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.in5
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@
46CFLAGS=@CFLAGS@ 46CFLAGS=@CFLAGS@
47CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ 47CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
48LIBS=@LIBS@ 48LIBS=@LIBS@
49SSHLIBS=@SSHLIBS@
49SSHDLIBS=@SSHDLIBS@ 50SSHDLIBS=@SSHDLIBS@
50LIBEDIT=@LIBEDIT@ 51LIBEDIT=@LIBEDIT@
51AR=@AR@ 52AR=@AR@
@@ -142,7 +143,7 @@ libssh.a: $(LIBSSH_OBJS)
142 $(RANLIB) $@ 143 $(RANLIB) $@
143 144
144ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) 145ssh$(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
147sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) 148sshd$(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)