Bmake fixes for eBones.

12 files changed, 22 insertions, 34 deletions

diff --git a/eBones/usr.sbin/Makefile.inc b/eBones/usr.sbin/Makefile.inc
index fd92864..a3ace61 100644
--- a/eBones/usr.sbin/Makefile.inc
+++ b/eBones/usr.sbin/Makefile.inc
@@ -1,3 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/6/93
 
 BINDIR?=	/usr/sbin
+
+.include "../Makefile.inc"
diff --git a/eBones/usr.sbin/ext_srvtab/Makefile b/eBones/usr.sbin/ext_srvtab/Makefile
index 431b847..e1ee1d5 100644
--- a/eBones/usr.sbin/ext_srvtab/Makefile
+++ b/eBones/usr.sbin/ext_srvtab/Makefile
@@ -1,11 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/09/07 20:50:29 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/13 17:24:16 markm Exp $
 
 PROG=	ext_srvtab
-CFLAGS+=-DKERBEROS -I${.CURDIR}/../../include  -Wall
+CFLAGS+=-DKERBEROS
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
 LDADD+=	-lkdb -lkrb -ldes
 MAN8=	ext_srvtab.8
-BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kadmind/Makefile b/eBones/usr.sbin/kadmind/Makefile
index 38cb3cb..37222ef 100644
--- a/eBones/usr.sbin/kadmind/Makefile
+++ b/eBones/usr.sbin/kadmind/Makefile
@@ -1,11 +1,10 @@
-#	$Id: Makefile,v 1.2 1995/09/07 20:50:44 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/13 17:24:18 markm Exp $
 
 PROG=	kadmind
 SRCS=	admin_server.c kadm_funcs.c kadm_ser_wrap.c kadm_server.c
-CFLAGS+=-DPOSIX -I${.CURDIR}/../../include -I${.CURDIR}/../../lib/libkadm -Wall
+CFLAGS+=-DPOSIX -I${.CURDIR}/../../lib/libkadm
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
 LDADD+=	-lkadm -lkdb -lkrb -ldes -lacl -lcom_err
 MAN8=	kadmind.8
-BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kdb_destroy/Makefile b/eBones/usr.sbin/kdb_destroy/Makefile
index 7e9cef0..f92eb0e 100644
--- a/eBones/usr.sbin/kdb_destroy/Makefile
+++ b/eBones/usr.sbin/kdb_destroy/Makefile
@@ -1,9 +1,8 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/09/07 20:51:07 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/13 17:24:23 markm Exp $
 
 PROG=	kdb_destroy
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG
 MAN8=	kdb_destroy.8
-BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kdb_edit/Makefile b/eBones/usr.sbin/kdb_edit/Makefile
index a38714d..7a05577 100644
--- a/eBones/usr.sbin/kdb_edit/Makefile
+++ b/eBones/usr.sbin/kdb_edit/Makefile
@@ -1,12 +1,11 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 2/14/91
-#	$Id: Makefile,v 1.4 1995/09/07 20:51:11 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/13 17:24:24 markm Exp $
 
 PROG=	kdb_edit
-CFLAGS+=-DKERBEROS -DDEBUG -I. -I${.CURDIR}/../../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG -I.
 SRCS=	kdb_edit.c maketime.c
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
 LDADD=	-lkdb -lkrb -ldes
 MAN8=	kdb_edit.8
-BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kdb_init/Makefile b/eBones/usr.sbin/kdb_init/Makefile
index f084232..cc1b778 100644
--- a/eBones/usr.sbin/kdb_init/Makefile
+++ b/eBones/usr.sbin/kdb_init/Makefile
@@ -1,11 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/09/07 20:51:18 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/13 17:24:25 markm Exp $
 
 PROG=	kdb_init
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
 LDADD=	-lkdb -lkrb -ldes
 MAN8=	kdb_init.8
-BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kdb_util/Makefile b/eBones/usr.sbin/kdb_util/Makefile
index f04ae71..1f211a1 100644
--- a/eBones/usr.sbin/kdb_util/Makefile
+++ b/eBones/usr.sbin/kdb_util/Makefile
@@ -1,14 +1,12 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 2/14/91
-#	$Id: Makefile,v 1.4 1995/09/07 20:51:22 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/13 17:24:27 markm Exp $
 
 PROG=	kdb_util
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../kdb_edit \
-	-I${.CURDIR}/../../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../kdb_edit
 SRCS=	kdb_util.c maketime.c
 .PATH:	${.CURDIR}/../kdb_edit
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
 LDADD=	-lkdb -lkrb -ldes
 MAN8=	kdb_util.8
-BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kerberos/Makefile b/eBones/usr.sbin/kerberos/Makefile
index b32ca4e..224b335 100644
--- a/eBones/usr.sbin/kerberos/Makefile
+++ b/eBones/usr.sbin/kerberos/Makefile
@@ -1,12 +1,11 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.4 1995/09/07 20:51:30 mark Exp $
+#	$Id: Makefile,v 1.5 1995/09/13 17:24:28 markm Exp $
 
 PROG=	kerberos
 SRCS=	kerberos.c cr_err_reply.c
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
 LDADD=	-lkdb -lkrb -ldes
 NOMAN=	noman
-BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kprop/Makefile b/eBones/usr.sbin/kprop/Makefile
index 7f62e9e..d6063a6 100644
--- a/eBones/usr.sbin/kprop/Makefile
+++ b/eBones/usr.sbin/kprop/Makefile
@@ -1,11 +1,9 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.2 1995/09/07 20:51:44 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/13 17:24:29 markm Exp $
 
 PROG=	kprop
-CFLAGS+=-I${.CURDIR}/../../include -Wall
 DPADD=	${LIBKRB} ${LIBDES}
 LDADD=	-lkrb -ldes
-BINDIR=	/usr/sbin
 NOMAN=	noman
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/ksrvutil/Makefile b/eBones/usr.sbin/ksrvutil/Makefile
index dbe479f..199cf48 100644
--- a/eBones/usr.sbin/ksrvutil/Makefile
+++ b/eBones/usr.sbin/ksrvutil/Makefile
@@ -1,11 +1,10 @@
-#	$Id: Makefile,v 1.2 1995/09/07 20:53:52 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/13 17:24:34 markm Exp $
 
 PROG=	ksrvutil
 SRCS=	ksrvutil.c
-CFLAGS+=	-I${.CURDIR}/../../include -I${.CURDIR}/../../lib/libkadm -Wall
+CFLAGS+=	-I${.CURDIR}/../../lib/libkadm
 DPADD=	${LIBKRB} ${LIBDES}
 LDADD+=	-lkadm -lkrb -ldes -lcom_err
 MAN8=	ksrvutil.8
-BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/kstash/Makefile b/eBones/usr.sbin/kstash/Makefile
index 664b8c9..cf97f8c 100644
--- a/eBones/usr.sbin/kstash/Makefile
+++ b/eBones/usr.sbin/kstash/Makefile
@@ -1,11 +1,10 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 3/5/91
-#	$Id: Makefile,v 1.4 1995/09/07 20:53:56 mark Exp $
+#	$Id: Makefile,v 1.5 1995/09/13 17:24:35 markm Exp $
 
 PROG=	kstash
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
 LDADD=	-lkdb -lkrb -ldes
 MAN8=	kstash.8
-BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/make_keypair/Makefile b/eBones/usr.sbin/make_keypair/Makefile
index a1c38b2..f100cdc 100644
--- a/eBones/usr.sbin/make_keypair/Makefile
+++ b/eBones/usr.sbin/make_keypair/Makefile
@@ -3,10 +3,8 @@
 
 PROG=	make_keypair
 MAN8=	make_keypair.8
-CFLAGS+=-DKERBEROS -I${.CURDIR}/../../include \
-	-I${.CURDIR}/../../usr.bin/register -Wall
+CFLAGS+=-DKERBEROS -I${.CURDIR}/../../usr.bin/register
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
 LDADD=	-lkdb -lkrb -ldes
-BINDIR=	/usr/sbin
 
 .include <bsd.prog.mk>