diff options
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/Makefile | 6 | ||||
| -rw-r--r-- | libexec/login_chpass/Makefile | 11 | ||||
| -rw-r--r-- | libexec/login_krb5-or-pwd/Makefile | 12 |
3 files changed, 5 insertions, 24 deletions
diff --git a/libexec/Makefile b/libexec/Makefile index 18fb7b223e5..49d3de8e6e6 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.7 (Berkeley) 4/1/91 -# $OpenBSD: Makefile,v 1.59 2014/04/18 15:57:12 tedu Exp $ +# $OpenBSD: Makefile,v 1.60 2014/04/22 10:21:56 reyk Exp $ .include <bsd.own.mk> @@ -13,8 +13,4 @@ SUBDIR= comsat fingerd ftpd getty ld.so lockspool login_chpass \ SUBDIR+=rpc.yppasswdd .endif -.if (${KERBEROS5:L} == "yes") -SUBDIR+=login_krb5 login_krb5-or-pwd -.endif - .include <bsd.subdir.mk> diff --git a/libexec/login_chpass/Makefile b/libexec/login_chpass/Makefile index 99cfa581958..3ffb8fe0699 100644 --- a/libexec/login_chpass/Makefile +++ b/libexec/login_chpass/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/13 08:14:22 jsg Exp $ +# $OpenBSD: Makefile,v 1.7 2014/04/22 10:21:56 reyk Exp $ PROG= login_chpass @@ -7,17 +7,10 @@ MAN= login_chpass.8 .PATH: ${.CURDIR}/../../usr.bin/passwd -.include <bsd.own.mk> # For KERBEROS5 and YP +.include <bsd.own.mk> # For YP CFLAGS+=-Wall -#.if (${KERBEROS5:L} == "yes") -#SRCS+= krb5_passwd.c -#CFLAGS+= -DKRB5 -#DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} -#LDADD+= -lkrb5 -lasn1 -lcrypto -#.endif - .if (${YP:L} == "yes") CFLAGS+=-DYP SRCS+= yp_passwd.c pwd_check.c pwd_gensalt.c diff --git a/libexec/login_krb5-or-pwd/Makefile b/libexec/login_krb5-or-pwd/Makefile index a20b0ef916d..1857f5da110 100644 --- a/libexec/login_krb5-or-pwd/Makefile +++ b/libexec/login_krb5-or-pwd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2014/04/15 20:55:42 miod Exp $ +# $OpenBSD: Makefile,v 1.19 2014/04/22 10:21:56 reyk Exp $ .include <bsd.own.mk> @@ -7,18 +7,10 @@ SRCS= login.c login_passwd.c pwd_gensalt.c MAN= ${PROG}.8 CFLAGS+=-DPASSWD -Wall -I${.CURDIR}/../login_passwd -.if (${KERBEROS5:L} == "yes") -SRCS+= login_krb5.c -DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBUTIL} -LDADD+= -lkrb5 -lasn1 -lcrypto -lutil -LDADD+= -lwind -lroken -lcom_err -lheimbase -CFLAGS+=-DKRB5 -.PATH: ${.CURDIR}/../login_passwd ${.CURDIR}/../login_krb5 ${.CURDIR}/../../usr.bin/passwd -.else DPADD+= ${LIBUTIL} LDADD+= -lutil + .PATH: ${.CURDIR}/../login_passwd ${.CURDIR}/../../usr.bin/passwd -.endif BINOWN= root BINGRP= auth |