diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-08-17 09:40:38 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-08-17 09:40:38 +0000 |
| commit | 400101de7bfe6c125ed96aae4ca450d414d2effc (patch) | |
| tree | 8a0e267de9f32c291ffadf4c4b920625d04475e4 /kerberosV | |
| parent | 3457a01d9e51d8ee0acc7a3a61244c29c3d109e4 (diff) | |
Switch several kerberos/afs tools from using using libreadline
to libedit to prevent the resulting binaries from falling under
the GPL. Prototypes are internally defined so no includes have
to be changed.
ok miod@ reyk@ "I very much approve" deraadt@
Diffstat (limited to 'kerberosV')
| -rw-r--r-- | kerberosV/usr.sbin/kadmin/Makefile | 6 | ||||
| -rw-r--r-- | kerberosV/usr.sbin/kstash/Makefile | 6 | ||||
| -rw-r--r-- | kerberosV/usr.sbin/ktutil/Makefile | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/kerberosV/usr.sbin/kadmin/Makefile b/kerberosV/usr.sbin/kadmin/Makefile index 7a110c7ac1a..7cc583f6246 100644 --- a/kerberosV/usr.sbin/kadmin/Makefile +++ b/kerberosV/usr.sbin/kadmin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2007/10/18 18:20:20 deraadt Exp $ +# $OpenBSD: Makefile,v 1.17 2009/08/17 09:40:37 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -43,9 +43,9 @@ kadmin-commands.c kadmin-commands.h: kadmin-commands.in $(SLC) ./$(SLC) $(KRB5SRC)/kadmin/kadmin-commands.in CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 -I. -DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBKADM5SRV} ${LIBKADM5CLNT} \ +DPADD+= ${LIBEDIT} ${LIBCURSES} ${LIBKADM5SRV} ${LIBKADM5CLNT} \ ${LIBKRB5} ${LIBCRYPTO} ${LIBDES} -LDADD+= -lreadline -lcurses -lkadm5srv -lkadm5clnt \ +LDADD+= -ledit -lcurses -lkadm5srv -lkadm5clnt \ -lkrb5 -lcrypto -ldes CLEANFILES+= kadmin-commands.c slc lc-lex.o kadmin-commands.h \ diff --git a/kerberosV/usr.sbin/kstash/Makefile b/kerberosV/usr.sbin/kstash/Makefile index 043c52b7361..260b5c2fb66 100644 --- a/kerberosV/usr.sbin/kstash/Makefile +++ b/kerberosV/usr.sbin/kstash/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2006/04/23 21:25:11 biorn Exp $ +# $OpenBSD: Makefile,v 1.8 2009/08/17 09:40:37 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -15,9 +15,9 @@ SRCS+= ${PRINTVER} CFLAGS+=-I${KRB5SRC}/lib/krb5 -DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBDES} ${LIBKRB5} \ +DPADD+= ${LIBEDIT} ${LIBCURSES} ${LIBDES} ${LIBKRB5} \ ${LIBCRYPTO} -LDADD+= -lreadline -lcurses -ldes -lkrb5 \ +LDADD+= -ledit -lcurses -ldes -lkrb5 \ -lcrypto .include <bsd.prog.mk> diff --git a/kerberosV/usr.sbin/ktutil/Makefile b/kerberosV/usr.sbin/ktutil/Makefile index f857c10b8fa..c2725bffac8 100644 --- a/kerberosV/usr.sbin/ktutil/Makefile +++ b/kerberosV/usr.sbin/ktutil/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2008/01/29 00:29:34 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2009/08/17 09:40:37 jsg Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -42,9 +42,9 @@ ktutil-commands.c ktutil-commands.h: ktutil-commands.in $(SLC) CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 -I. -DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBKADM5CLNT} ${LIBKRB5} \ +DPADD+= ${LIBEDIT} ${LIBCURSES} ${LIBKADM5CLNT} ${LIBKRB5} \ ${LIBCRYPTO} ${LIBDES} -LDADD+= -lreadline -lcurses -lkadm5clnt -lkrb5 \ +LDADD+= -ledit -lcurses -lkadm5clnt -lkrb5 \ -lcrypto -ldes CLEANFILES+= ktutil-commands.c slc slc-lex.o \ |