summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sshd
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2003-08-24 18:17:39 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2003-08-24 18:17:39 +0000
commit1d36f62b5a7183992bb89b418a92ffb763d03d24 (patch)
tree6cc985065278579cb575aa7c8bd58db2748a34ad /usr.bin/ssh/sshd
parentcd01cbc2cd831341e2cd7e57bf946739b4069eeb (diff)
re-organize Makefiles so that static builds actually work
Diffstat (limited to 'usr.bin/ssh/sshd')
-rw-r--r--usr.bin/ssh/sshd/Makefile21
1 files changed, 9 insertions, 12 deletions
diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile
index 10fa98d15cc..ca79df25e01 100644
--- a/usr.bin/ssh/sshd/Makefile
+++ b/usr.bin/ssh/sshd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.60 2003/08/22 13:22:27 markus Exp $
+# $OpenBSD: Makefile,v 1.61 2003/08/24 18:17:38 deraadt Exp $
.PATH: ${.CURDIR}/..
@@ -21,20 +21,17 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
.include <bsd.own.mk> # for KERBEROS and AFS
.if (${KERBEROS5:L} == "yes")
-CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV
-SRCS+= auth-krb5.c
-
-LDADD+= -lkrb5
-DPADD+= ${LIBKRB5}
-
-SRCS+= auth2-gss.c gss-serv.c gss-serv-krb5.c
-CFLAGS+= -DGSSAPI
-LDADD+= -lgssapi
-DPADD+= ${LIBGSSAPI}
-.endif # KERBEROS5
+CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV -DGSSAPI
+SRCS+= auth-krb5.c auth2-gss.c gss-serv.c gss-serv-krb5.c
+.endif
.include <bsd.prog.mk>
+.if (${KERBEROS5:L} == "yes")
+LDADD+= -lgssapi -lkrb5
+DPADD+= ${LIBGSSAPI} ${LIBKRB5}
+.endif
+
DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBDES}
LDADD+= -lcrypto -lutil -lz -ldes