summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authortim <tim>2013-02-20 03:01:51 +0000
committertim <tim>2013-02-20 03:01:51 +0000
commitafea195b8d7065dcbee9a8fd6a54a184db7bf5b1 (patch)
tree40edc2b1f279503098b7495976ec250dcf1cbd3f /Makefile.in
parentd3cf109921ff869d78783e71f348c6fb438945d5 (diff)
downloadopenssh-afea195b8d7065dcbee9a8fd6a54a184db7bf5b1.tar.gz
- (tim) [krl.c Makefile.in regress/Makefile regress/modpipe.c] remove unneeded
err.h include from krl.c. Additional portability fixes for modpipe. OK djm
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in12
1 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index ec3e1f41..44d59444 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.331 2013/02/12 00:00:34 djm Exp $
+# $Id: Makefile.in,v 1.332 2013/02/20 03:01:51 tim Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@
@@ -379,14 +379,16 @@ uninstall:
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
-tests interop-tests: $(TARGETS)
+regress/modpipe: $(srcdir)/regress/modpipe.c
+ [ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
+ $(CC) $(CPPFLAGS) -o $@ $? \
+ $(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
+
+tests interop-tests: $(TARGETS) regress/modpipe
BUILDDIR=`pwd`; \
[ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
[ -f `pwd`/regress/Makefile ] || \
ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile ; \
- [ -f `pwd`/regress/modpipe.c ] || \
- ln -s `cd $(srcdir) && pwd`/regress/modpipe.c `pwd`/regress/modpipe.c; \
- (cd regress && make prereq); \
TEST_SHELL="@TEST_SHELL@"; \
TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \