Bmake fixes for the eBones tree.

6 files changed, 15 insertions, 21 deletions

diff --git a/eBones/usr.bin/Makefile.inc b/eBones/usr.bin/Makefile.inc
index 84bfd7f..5506596 100644
--- a/eBones/usr.bin/Makefile.inc
+++ b/eBones/usr.bin/Makefile.inc
@@ -1,3 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/6/93
 
 BINDIR?=	/usr/bin
+
+.include "../Makefile.inc"
diff --git a/eBones/usr.bin/kadmin/Makefile b/eBones/usr.bin/kadmin/Makefile
index 0754009..48a6d1d 100644
--- a/eBones/usr.bin/kadmin/Makefile
+++ b/eBones/usr.bin/kadmin/Makefile
@@ -1,11 +1,9 @@
-#	$Id$
+#	$Id: Makefile,v 1.5 1995/09/13 17:24:06 markm Exp $
 
-BINDIR=	/usr/bin
 PROG=	kadmin
-SRCS=	kadmin.c kadmin_cmds.c krb_err.h
+SRCS=	kadmin.c kadmin_cmds.c
 CLEANFILES+=	kadmin_cmds.c krb_err.c
-CFLAGS+=	-DPOSIX -I${.CURDIR}/../../include \
-		-I${.CURDIR}/../../lib/libkadm -Wall
+CFLAGS+=	-DPOSIX -I${.CURDIR}/../../lib/libkadm
 DPADD= ${LIBKRB} ${LIBDES}
 LDADD+=	-lkadm -lkrb -ldes
 LDADD+=	-lss -lcom_err
@@ -15,8 +13,6 @@ kadmin_cmds.c:	kadmin_cmds.ct
 	test -e kadmin_cmds.ct || ln -s ${.CURDIR}/kadmin_cmds.ct .
 	mk_cmds kadmin_cmds.ct
 
-krb_err.h:
-	test -e krb_err.et || ln -s ${.CURDIR}/../../lib/libkrb/krb_err.et .
-	compile_et krb_err.et
-
 .include <bsd.prog.mk>
+
+kadmin.o: ${KRBOBJDIR}/krb_err.h
diff --git a/eBones/usr.bin/kdestroy/Makefile b/eBones/usr.bin/kdestroy/Makefile
index c28d537..19a157a 100644
--- a/eBones/usr.bin/kdestroy/Makefile
+++ b/eBones/usr.bin/kdestroy/Makefile
@@ -1,11 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/09/07 20:51:27 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/13 17:24:09 markm Exp $
 
 PROG=	kdestroy
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -DBSD42 -Wall
+CFLAGS+=-DKERBEROS -DDEBUG -DBSD42
 DPADD=	${LIBKRB} ${LIBDES}
 LDADD=	-lkrb -ldes
 MAN1=	kdestroy.1
-BINDIR=	/usr/bin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.bin/kinit/Makefile b/eBones/usr.bin/kinit/Makefile
index 382360c..f17237c 100644
--- a/eBones/usr.bin/kinit/Makefile
+++ b/eBones/usr.bin/kinit/Makefile
@@ -1,11 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/09/07 20:51:36 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/13 17:24:10 markm Exp $
 
 PROG=	kinit
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -DBSD42 -Wall
+CFLAGS+=-DKERBEROS -DDEBUG -DBSD42
 DPADD=	${LIBKRB} ${LIBDES}
 LDADD=	-lkrb -ldes
-BINDIR=	/usr/bin
 MAN1=	kinit.1
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.bin/klist/Makefile b/eBones/usr.bin/klist/Makefile
index 0ff3577..f77bf20 100644
--- a/eBones/usr.bin/klist/Makefile
+++ b/eBones/usr.bin/klist/Makefile
@@ -1,11 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/09/07 20:51:40 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/13 17:24:11 markm Exp $
 
 PROG=	klist
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG
 DPADD=	${LIBKRB} ${LIBDES}
 LDADD=	-lkrb -ldes
-BINDIR=	/usr/bin
 MAN1=	klist.1
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.bin/ksrvtgt/Makefile b/eBones/usr.bin/ksrvtgt/Makefile
index e1b6b5f..0fc63fd 100644
--- a/eBones/usr.bin/ksrvtgt/Makefile
+++ b/eBones/usr.bin/ksrvtgt/Makefile
@@ -1,11 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/09/07 20:53:47 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/13 17:24:12 markm Exp $
 
 PROG=	ksrvtgt
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG
 DPADD=	${LIBKRB} ${LIBDES}
 LDADD=	-lkrb -ldes
-BINDIR=	/usr/bin
 MAN1=	ksrvtgt.1
 
 .include <bsd.prog.mk>