diff options
| -rw-r--r-- | Makefile | 17 | ||||
| -rw-r--r-- | bin/rcp/Makefile | 16 | ||||
| -rw-r--r-- | include/Makefile | 6 | ||||
| -rw-r--r-- | kerberosV/Makefile.inc | 9 | ||||
| -rw-r--r-- | kerberosV/lib/krb5/Makefile | 7 | ||||
| -rw-r--r-- | kerberosV/usr.sbin/kstash/Makefile | 14 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 4 |
7 files changed, 22 insertions, 51 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.90 2003/04/17 03:48:56 drahn Exp $ +# $OpenBSD: Makefile,v 1.91 2003/05/14 08:01:02 mho Exp $ # # For more information on building in tricky environments, please see @@ -39,10 +39,6 @@ SUBDIR+= gnu SUBDIR+= sys lkm -.if (${KERBEROS:L} == "yes") -SUBDIR+= kerberosIV -.endif - .if (${KERBEROS5:L} == "yes") SUBDIR+= kerberosV .endif @@ -80,10 +76,6 @@ build: NOMAN=1 exec ${SUDO} ${MAKE} install cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \ NOMAN=1 exec ${SUDO} ${MAKE} install -.if (${KERBEROS:L} == "yes") - cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \ - NOMAN=1 exec ${SUDO} ${MAKE} install -.endif .if (${KERBEROS5:L} == "yes") cd ${.CURDIR}/kerberosV/lib && ${MAKE} depend && ${MAKE} && \ NOMAN=1 exec ${SUDO} ${MAKE} install @@ -326,13 +318,6 @@ cross-lib: ${CROSSGCC} ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ SKIPDIR="${NO_CROSS} libocurses/PSD.doc" \ ${MAKE} depend all install) -.if (${KERBEROS:L} == "yes") - MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \ - export MACHINE MACHINE_ARCH; \ - cd kerberosIV/lib; \ - ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ - ${MAKE} depend all install -.endif .if (${KERBEROS5:L} == "yes") MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \ export MACHINE MACHINE_ARCH; \ diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile index fd0ad5e570c..ac55a1d66e2 100644 --- a/bin/rcp/Makefile +++ b/bin/rcp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2002/05/09 18:44:45 millert Exp $ +# $OpenBSD: Makefile,v 1.9 2003/05/14 08:01:02 mho Exp $ PROG= rcp SRCS= rcp.c util.c @@ -8,12 +8,12 @@ BINMODE=555 .include <bsd.own.mk> # For KERBEROS -.if (${KERBEROS:L} == "yes") -.PATH: ${.CURDIR}/../../usr.bin/rsh -SRCS+= krcmd.c kcmd.c -CFLAGS+=-DKERBEROS -LDADD+= -lkrb -ldes -DPADD+= ${LIBKRB} ${LIBDES} -.endif +#.if (${KERBEROS:L} == "yes") +#.PATH: ${.CURDIR}/../../usr.bin/rsh +#SRCS+= krcmd.c kcmd.c +#CFLAGS+=-DKERBEROS +#LDADD+= -lkrb -ldes +#DPADD+= ${LIBKRB} ${LIBDES} +#.endif .include <bsd.prog.mk> diff --git a/include/Makefile b/include/Makefile index b7966e796de..03fa2356c20 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.116 2003/05/09 02:17:18 millert Exp $ +# $OpenBSD: Makefile,v 1.117 2003/05/14 08:01:02 mho Exp $ # $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $ # @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91 @@ -60,10 +60,6 @@ NOOBJ= noobj # Change SYS_INCLUDE in bsd.own.mk to "symlinks" if you don't want copies .include <bsd.own.mk> SYS_INCLUDE?= copies -.if ${KERBEROS:L} == "yes" -RDIRS+= ../kerberosIV/lib -PRDIRS+=../kerberosIV/lib/kadm ../kerberosIV/lib/krb -.endif .if ${KERBEROS5:L} == "yes" RDIRS+= ../kerberosV/lib .endif diff --git a/kerberosV/Makefile.inc b/kerberosV/Makefile.inc index 92052decbb7..75133cd4d2c 100644 --- a/kerberosV/Makefile.inc +++ b/kerberosV/Makefile.inc @@ -1,17 +1,13 @@ -# $OpenBSD: Makefile.inc,v 1.7 2003/05/11 03:53:07 hin Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2003/05/14 08:01:02 mho Exp $ KRB5DIR = ${.CURDIR}/${KRBDEPTH} KRB5SRC = ${.CURDIR}/${KRBDEPTH}/src -KRB4DIR = ${KRB5DIR}/../kerberosIV -KRB4SRC = ${KRB4DIR}/src - CFLAGS += -DHAVE_CONFIG_H -DBINDIR=\"/usr/bin\" -DSBINDIR=\"/usr/sbin\"\ -DLIBEXECDIR=\"/usr/libexec\" -DSYSCONFDIR=\"/etc/kerberosV\" \ -I${DESTDIR}/usr/include/kerberosV \ - -I${DESTDIR}/usr/include/kerberosIV \ -I${KRB5DIR}/include -I${KRB5SRC}/lib/roken\ - -I${KRB5SRC}/include -I${KRB4SRC}/lib/sl + -I${KRB5SRC}/include -I${KRB5SRC}/lib/sl CFLAGS+= -Wall .include <bsd.own.mk> # for 'NOPIC' definition .if !defined(NOPIC) @@ -20,7 +16,6 @@ CFLAGS += -DHAVE_DLOPEN LIBROKEN= -L${KRBDEPTH}/lib/roken -lroken LIBROKEN_PIC= -L${KRBDEPTH}/lib/roken -lroken_pic -LIBSL= -L${KRBDEPTH}/../kerberosIV/lib/sl -lsl .PATH: ${KRB5SRC}/man diff --git a/kerberosV/lib/krb5/Makefile b/kerberosV/lib/krb5/Makefile index b1053d3aca4..a90310ea552 100644 --- a/kerberosV/lib/krb5/Makefile +++ b/kerberosV/lib/krb5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2003/05/14 04:58:36 hin Exp $ +# $OpenBSD: Makefile,v 1.26 2003/05/14 08:01:02 mho Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -255,11 +255,6 @@ CFLAGS+=-I${KRB5SRC}/lib/kafs -DROKEN_RENAME SRCS+= afskrb5.c \ afssys_openbsd.c \ common.c - -#.if (${KERBEROS:L} == "yes") -#SRCS+= afskrb.c -#.endif - MAN+= kafs.3 MLINKS+=kafs.3 k_hasafs.3 \ kafs.3 k_pioctl.3 \ diff --git a/kerberosV/usr.sbin/kstash/Makefile b/kerberosV/usr.sbin/kstash/Makefile index c7690fcb4f4..90666a97d4e 100644 --- a/kerberosV/usr.sbin/kstash/Makefile +++ b/kerberosV/usr.sbin/kstash/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2002/05/11 00:20:20 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2003/05/14 08:01:02 mho Exp $ KRBDEPTH=../.. .include <${.CURDIR}/../../Makefile.inc> @@ -6,13 +6,15 @@ KRBDEPTH=../.. PROG= kstash NOMAN= -SRCS= kstash.c +SRCS= kstash.c \ + sl.c .PATH: ${KRB5SRC}/kdc +.PATH: ${KRB5SRC}/lib/sl CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 -DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBKRB} ${LIBDES} ${LIBHDB} ${LIBKRB5} \ - ${LIBKADM5SRV} ${LIBKADM5CLNT} ${LIBKAFS} -LDADD+= ${LIBSL} -lreadline -lcurses -lkrb -ldes -lhdb \ - -lkrb5 -lkadm5srv -lkadm5clnt ${LIBROKEN} -lkafs +DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBDES} ${LIBHDB} \ + ${LIBKRB5} ${LIBCRYPTO} ${LIBKADM5SRV} ${LIBKADM5CLNT} +LDADD+= -lreadline -lcurses -ldes -lhdb \ + -lkrb5 -lcrypto -lkadm5srv -lkadm5clnt ${LIBROKEN} .include <bsd.prog.mk> diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 2acca5dc259..f3cd09cf2c3 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.own.mk,v 1.65 2003/05/13 20:36:08 mho Exp $ +# $OpenBSD: bsd.own.mk,v 1.66 2003/05/14 08:01:02 mho Exp $ # $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $ # Host-specific overrides @@ -12,8 +12,6 @@ WARNINGS?= no # Set `SKEY' to `yes' to build with support for S/key authentication. SKEY?= yes -# Set `KERBEROS' to `yes' to build with support for Kerberos authentication. -KERBEROS?= yes # Set `KERBEROS5' to `yes' to build with support for Kerberos5 authentication. KERBEROS5?= yes # Set `YP' to `yes' to build with support for NIS/YP. |