diff options
author | markm <markm@FreeBSD.org> | 1999-01-25 06:49:43 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 1999-01-25 06:49:43 +0000 |
commit | 924db72bc603c361cd9ee1dd36e5d5c83aa2a900 (patch) | |
tree | 49d1d6bad2a40c3a72d3f15ad95b4e788f4f2258 /kerberosIV/usr.sbin | |
parent | 5e3f42b3eded5cbce5c184a99d742385b941b62b (diff) | |
download | FreeBSD-src-924db72bc603c361cd9ee1dd36e5d5c83aa2a900.zip FreeBSD-src-924db72bc603c361cd9ee1dd36e5d5c83aa2a900.tar.gz |
Link everything against libcrypt. ELF builds complain without it.
Clean up the master makefile a bit and add a "dekerberise" target
for those who have shot themselves in the foot.
Thanks to: Randy Bush
Diffstat (limited to 'kerberosIV/usr.sbin')
-rw-r--r-- | kerberosIV/usr.sbin/ext_srvtab/Makefile | 7 | ||||
-rw-r--r-- | kerberosIV/usr.sbin/kadmind/Makefile | 6 | ||||
-rw-r--r-- | kerberosIV/usr.sbin/kdb_destroy/Makefile | 7 | ||||
-rw-r--r-- | kerberosIV/usr.sbin/kdb_edit/Makefile | 7 | ||||
-rw-r--r-- | kerberosIV/usr.sbin/kdb_init/Makefile | 7 | ||||
-rw-r--r-- | kerberosIV/usr.sbin/kdb_util/Makefile | 7 | ||||
-rw-r--r-- | kerberosIV/usr.sbin/kerberos/Makefile | 7 | ||||
-rw-r--r-- | kerberosIV/usr.sbin/kip/Makefile | 6 | ||||
-rw-r--r-- | kerberosIV/usr.sbin/kprop/Makefile | 6 | ||||
-rw-r--r-- | kerberosIV/usr.sbin/kstash/Makefile | 7 |
10 files changed, 30 insertions, 37 deletions
diff --git a/kerberosIV/usr.sbin/ext_srvtab/Makefile b/kerberosIV/usr.sbin/ext_srvtab/Makefile index f9d7d01..d525b71 100644 --- a/kerberosIV/usr.sbin/ext_srvtab/Makefile +++ b/kerberosIV/usr.sbin/ext_srvtab/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.2 1997/10/02 15:03:20 markm Exp $ PROG= ext_srvtab MAN8= ${KRB4DIR}/man/ext_srvtab.8 @@ -11,9 +11,8 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/krb \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kadmind/Makefile b/kerberosIV/usr.sbin/kadmind/Makefile index eb54cdc..2c2bf50 100644 --- a/kerberosIV/usr.sbin/kadmind/Makefile +++ b/kerberosIV/usr.sbin/kadmind/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.2 1998/03/20 17:48:12 markm Exp $ PROG= kadmind MAN8= ${KRB4DIR}/man/kadmind.8 @@ -18,9 +18,9 @@ CFLAGS+= -I${KRB4DIR}/include \ LDADD= -L${ROKENOBJDIR} -lroken -L${SLOBJDIR} -lsl \ -L${ACLOBJDIR} -lacl -L${KADMOBJDIR} -lkadm \ -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \ - -ldes -lcom_err + -ldes -lcom_err -lcrypt DPADD= ${LIBROKEN} ${LIBSL} ${LIBACL} ${LIBKADM} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} ${LIBCOM_ERR} + ${LIBDES} ${LIBCOM_ERR} ${LIBCRYPT} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kdb_destroy/Makefile b/kerberosIV/usr.sbin/kdb_destroy/Makefile index af5277d..0c6b1ef 100644 --- a/kerberosIV/usr.sbin/kdb_destroy/Makefile +++ b/kerberosIV/usr.sbin/kdb_destroy/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.2 1997/10/02 15:03:20 markm Exp $ PROG= kdb_destroy MAN8= ${KRB4DIR}/man/kdb_destroy.8 @@ -11,9 +11,8 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/admin \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${CRYPT} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kdb_edit/Makefile b/kerberosIV/usr.sbin/kdb_edit/Makefile index e5a7ff9..8df998c 100644 --- a/kerberosIV/usr.sbin/kdb_edit/Makefile +++ b/kerberosIV/usr.sbin/kdb_edit/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.2 1997/10/02 15:03:21 markm Exp $ PROG= kdb_edit MAN8= ${KRB4DIR}/man/kdb_edit.8 @@ -11,9 +11,8 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/admin \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kdb_init/Makefile b/kerberosIV/usr.sbin/kdb_init/Makefile index d51519a..937a1b3 100644 --- a/kerberosIV/usr.sbin/kdb_init/Makefile +++ b/kerberosIV/usr.sbin/kdb_init/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.2 1997/10/02 15:03:21 markm Exp $ PROG= kdb_init MAN8= ${KRB4DIR}/man/kdb_init.8 @@ -11,9 +11,8 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/admin \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kdb_util/Makefile b/kerberosIV/usr.sbin/kdb_util/Makefile index e43fd55..c65a93b 100644 --- a/kerberosIV/usr.sbin/kdb_util/Makefile +++ b/kerberosIV/usr.sbin/kdb_util/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.2 1997/10/02 15:03:22 markm Exp $ PROG= kdb_util MAN8= ${KRB4DIR}/man/kdb_util.8 @@ -11,9 +11,8 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/admin \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kerberos/Makefile b/kerberosIV/usr.sbin/kerberos/Makefile index 5c9f024..b58848a 100644 --- a/kerberosIV/usr.sbin/kerberos/Makefile +++ b/kerberosIV/usr.sbin/kerberos/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.2 1997/10/02 15:03:22 markm Exp $ PROG= kerberos MAN1= ${KRB4DIR}/man/kerberos.1 @@ -15,9 +15,8 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRBOBJDIR} \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \ - -ldes -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kip/Makefile b/kerberosIV/usr.sbin/kip/Makefile index 17dfb39..c9a88ed 100644 --- a/kerberosIV/usr.sbin/kip/Makefile +++ b/kerberosIV/usr.sbin/kip/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1.1.1 1997/09/24 20:37:14 markm Exp $ PROG= kip NOMAN= true @@ -9,8 +9,8 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/kadmin \ -I${KRBOBJDIR} \ -I${.CURDIR}/../include -LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} +LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kprop/Makefile b/kerberosIV/usr.sbin/kprop/Makefile index 1fc0515d..f83b0ce 100644 --- a/kerberosIV/usr.sbin/kprop/Makefile +++ b/kerberosIV/usr.sbin/kprop/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1.1.1 1997/09/24 20:37:14 markm Exp $ PROG= kprop MAN8= ${KRB4DIR}/man/kprop.8 @@ -10,8 +10,8 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/slave \ -I${INCLOBJDIR} \ -I${.CURDIR}/../include -LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} +LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.sbin/kstash/Makefile b/kerberosIV/usr.sbin/kstash/Makefile index 0dcdc60..1d689df 100644 --- a/kerberosIV/usr.sbin/kstash/Makefile +++ b/kerberosIV/usr.sbin/kstash/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.2 1997/10/02 15:03:23 markm Exp $ PROG= kstash MAN8= ${KRB4DIR}/man/kstash.8 @@ -11,9 +11,8 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/kdb \ -I${.CURDIR}/../include LDADD= -L${ROKENOBJDIR} -lroken \ - -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} \ - ${LIBDES} + -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt +DPADD= ${LIBROKEN} ${LIBKDB} ${LIBKRB} ${LIBDES} ${LIBCRYPT} .include <bsd.prog.mk> |