summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in23
1 files changed, 15 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in
index f1b45cdde..ce0239d05 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.274 2006/01/01 08:47:05 djm Exp $ 1# $Id: Makefile.in,v 1.283 2006/10/23 21:44:47 tim 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@
@@ -11,6 +11,7 @@ bindir=@bindir@
11sbindir=@sbindir@ 11sbindir=@sbindir@
12libexecdir=@libexecdir@ 12libexecdir=@libexecdir@
13datadir=@datadir@ 13datadir=@datadir@
14datarootdir=@datarootdir@
14mandir=@mandir@ 15mandir=@mandir@
15mansubdir=@mansubdir@ 16mansubdir=@mansubdir@
16sysconfdir=@sysconfdir@ 17sysconfdir=@sysconfdir@
@@ -43,6 +44,8 @@ LD=@LD@
43CFLAGS=@CFLAGS@ 44CFLAGS=@CFLAGS@
44CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ 45CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
45LIBS=@LIBS@ 46LIBS=@LIBS@
47LIBSELINUX=@LIBSELINUX@
48SSHDLIBS=@SSHDLIBS@
46LIBEDIT=@LIBEDIT@ 49LIBEDIT=@LIBEDIT@
47LIBPAM=@LIBPAM@ 50LIBPAM=@LIBPAM@
48LIBWRAP=@LIBWRAP@ 51LIBWRAP=@LIBWRAP@
@@ -62,11 +65,11 @@ INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@
62 65
63TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT) 66TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} sftp-server$(EXEEXT) sftp$(EXEEXT)
64 67
65LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o buffer.o \ 68LIBSSH_OBJS=acss.o authfd.o authfile.o bufaux.o bufbn.o buffer.o \
66 canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \ 69 canohost.o channels.o cipher.o cipher-acss.o cipher-aes.o \
67 cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ 70 cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
68 compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \ 71 compat.o compress.o crc32.o deattack.o fatal.o hostfile.o \
69 log.o match.o moduli.o nchan.o packet.o \ 72 log.o match.o md-sha256.o moduli.o nchan.o packet.o \
70 readpass.o rsa.o ttymodes.o xmalloc.o \ 73 readpass.o rsa.o ttymodes.o xmalloc.o \
71 atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ 74 atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \
72 monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \ 75 monitor_fdpass.o rijndael.o ssh-dss.o ssh-rsa.o dh.o kexdh.o \
@@ -86,7 +89,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
86 auth-krb5.o \ 89 auth-krb5.o \
87 auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\ 90 auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o\
88 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ 91 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
89 audit.o audit-bsm.o 92 audit.o audit-bsm.o platform.o
90 93
91MANPAGES = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out 94MANPAGES = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out
92MANPAGES_IN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5 95MANPAGES_IN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5
@@ -107,7 +110,7 @@ PATHSUBS = \
107 -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \ 110 -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \
108 -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \ 111 -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
109 -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \ 112 -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \
110 -e 's|/etc/sshrc|$(sysconfdir)/sshrc|g' \ 113 -e 's|/etc/ssh/sshrc|$(sysconfdir)/sshrc|g' \
111 -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \ 114 -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \
112 -e 's|/var/empty|$(PRIVSEP_PATH)|g' \ 115 -e 's|/var/empty|$(PRIVSEP_PATH)|g' \
113 -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g' 116 -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g'
@@ -136,7 +139,7 @@ ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)
136 $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 139 $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
137 140
138sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) 141sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)
139 $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBS) 142 $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBSELINUX) $(SSHDLIBS) $(LIBS)
140 143
141scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o 144scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
142 $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 145 $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
@@ -201,8 +204,9 @@ clean: regressclean
201 204
202distclean: regressclean 205distclean: regressclean
203 rm -f *.o *.a $(TARGETS) logintest config.cache config.log 206 rm -f *.o *.a $(TARGETS) logintest config.cache config.log
204 rm -f *.out core opensshd.init 207 rm -f *.out core opensshd.init openssh.xml
205 rm -f Makefile buildpkg.sh config.h config.status ssh_prng_cmds survey.sh *~ 208 rm -f Makefile buildpkg.sh config.h config.status ssh_prng_cmds
209 rm -f survey.sh openbsd-compat/regress/Makefile *~
206 rm -rf autom4te.cache 210 rm -rf autom4te.cache
207 (cd openbsd-compat && $(MAKE) distclean) 211 (cd openbsd-compat && $(MAKE) distclean)
208 (cd scard && $(MAKE) distclean) 212 (cd scard && $(MAKE) distclean)
@@ -410,6 +414,9 @@ tests: $(TARGETS)
410 EXEEXT="$(EXEEXT)" \ 414 EXEEXT="$(EXEEXT)" \
411 $@ 415 $@
412 416
417compat-tests: $(LIBCOMPAT)
418 (cd openbsd-compat/regress && $(MAKE))
419
413regressclean: 420regressclean:
414 if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \ 421 if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \
415 (cd regress && $(MAKE) clean) \ 422 (cd regress && $(MAKE) clean) \