Bmake fixes for the eBones tree.

15 files changed, 44 insertions, 56 deletions

diff --git a/eBones/lib/Makefile.inc b/eBones/lib/Makefile.inc
index 62677fd..b0b4ed2 100644
--- a/eBones/lib/Makefile.inc
+++ b/eBones/lib/Makefile.inc
@@ -1,3 +1,4 @@
-# Default version for system libs (override in <lib>/Makefile if necessary)
-SHLIB_MAJOR?= 2
-SHLIB_MINOR?= 0
+SHLIB_MAJOR?=	2
+SHLIB_MINOR?=	0
+
+.include "../Makefile.inc"
diff --git a/eBones/lib/libacl/Makefile b/eBones/lib/libacl/Makefile
index 3eefb2f..7fa05c0 100644
--- a/eBones/lib/libacl/Makefile
+++ b/eBones/lib/libacl/Makefile
@@ -1,8 +1,8 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id$
+#	$Id: Makefile,v 1.4 1995/09/13 17:23:49 markm Exp $
 
 LIB=	acl
-CFLAGS+=-DDEBUG -DKERBEROS -I${.CURDIR}/../../include -Wall
+CFLAGS+=-DDEBUG -DKERBEROS
 SRCS=	acl_files.c
 MAN3=	acl_check.3
 MLINKS=	acl_check.3 acl_canonicalize_principal.3 \
diff --git a/eBones/lib/libkadm/Makefile b/eBones/lib/libkadm/Makefile
index 45e6d04..f015f96 100644
--- a/eBones/lib/libkadm/Makefile
+++ b/eBones/lib/libkadm/Makefile
@@ -1,19 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id$
+#	$Id: Makefile,v 1.4 1995/09/13 17:23:51 markm Exp $
 
 LIB=	kadm
 
-SRCS=	kadm_err.c kadm_stream.c kadm_supp.c kadm_cli_wrap.c krb_err.h
-CFLAGS+=	-I. -I${.CURDIR} -I${.CURDIR}/../../include -DPOSIX -Wall
-CLEANFILES+=	kadm_err.c kadm_err.h krb_err.c krb_err.h
-
-kadm_err.c kadm_err.h:	kadm_err.et
-	test -e kadm_err.et || ln -s ${.CURDIR}/kadm_err.et .
-	compile_et kadm_err.et
-
-krb_err.h:
-	test -e krb_err.et || ln -s ${.CURDIR}/../libkrb/krb_err.et .
-	compile_et krb_err.et
+SRCS=	kadm_err.c kadm_stream.c kadm_supp.c kadm_cli_wrap.c
+CFLAGS+=	-I. -I{.CURDIR} -I${KRBOBJDIR} -DPOSIX
 
 beforeinstall:
 	-cd ${.CURDIR}; cmp -s kadm.h \
@@ -26,3 +17,6 @@ beforeinstall:
 	    ${DESTDIR}/usr/include/kerberosIV
 
 .include <bsd.lib.mk>
+
+kadm_cli_wrap.o: ${KRBOBJDIR}/krb_err.h
+kadm_err.c: ${KADMOBJDIR}/kadm_err.h
diff --git a/eBones/lib/libkdb/Makefile b/eBones/lib/libkdb/Makefile
index b2b3314..29beb24 100644
--- a/eBones/lib/libkdb/Makefile
+++ b/eBones/lib/libkdb/Makefile
@@ -1,8 +1,8 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id$
+#	$Id: Makefile,v 1.4 1995/09/13 17:23:53 markm Exp $
 
 LIB=	kdb
-CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../include -Wall
+CFLAGS+=-DKERBEROS -DDEBUG
 SRCS=	krb_cache.c krb_dbm.c krb_kdb_utils.c krb_lib.c print_princ.c
 
 .include <bsd.lib.mk>
diff --git a/eBones/lib/libkrb/Makefile b/eBones/lib/libkrb/Makefile
index 82d6a1c..eefe1a5 100644
--- a/eBones/lib/libkrb/Makefile
+++ b/eBones/lib/libkrb/Makefile
@@ -1,8 +1,8 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id$
+#	$Id: Makefile,v 1.8 1995/09/13 17:23:55 markm Exp $
 
 LIB=	krb
-CFLAGS+=-DKERBEROS -DCRYPT -DDEBUG -I${.CURDIR}/../../include -DBSD42 -Wall
+CFLAGS+=-DKERBEROS -DCRYPT -DDEBUG -DBSD42
 SRCS=	krb_err.c create_auth_reply.c create_ciph.c \
 	create_death_packet.c create_ticket.c debug_decl.c decomp_ticket.c \
 	des_rw.c dest_tkt.c extract_ticket.c fgetst.c get_ad_tkt.c \
@@ -17,10 +17,6 @@ SRCS=	krb_err.c create_auth_reply.c create_ciph.c \
 	save_credentials.c send_to_kdc.c sendauth.c stime.c tf_util.c \
 	tkt_string.c util.c
 
-krb_err.c krb_err.h: krb_err.et
-	test -e krb_err.et || ln -s ${.CURDIR}/krb_err.et .
-	compile_et krb_err.et
-
 LDADD+=	-lcom_err
 
 beforeinstall:
@@ -52,3 +48,6 @@ MLINKS+=tf_util.3 tf_init.3 tf_util.3 tf_get_pname.3 \
 	tf_util.3 tf_close.3
 
 .include <bsd.lib.mk>
+
+krb_err.c: ${KRBOBJDIR}/krb_err.h
+
diff --git a/eBones/libexec/Makefile.inc b/eBones/libexec/Makefile.inc
index f9922b6..d694f9b 100644
--- a/eBones/libexec/Makefile.inc
+++ b/eBones/libexec/Makefile.inc
@@ -1,3 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 
 BINDIR?=	/usr/libexec
+
+.include "../Makefile.inc"
diff --git a/eBones/libexec/kpropd/Makefile b/eBones/libexec/kpropd/Makefile
index 93bb3e8..0f1f420 100644
--- a/eBones/libexec/kpropd/Makefile
+++ b/eBones/libexec/kpropd/Makefile
@@ -1,11 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.2 1995/09/07 20:51:49 mark Exp $
+#	$Id: Makefile,v 1.4 1995/09/13 17:24:02 markm Exp $
 
 PROG=	kpropd
-CFLAGS+=-I${.CURDIR}/../../include -I${.CURDIR}/../../usr.sbin/kprop -Wall
+CFLAGS+=-I${.CURDIR}/../../usr.sbin/kprop
 DPADD+=	${LIBKRB} ${LIBDES}
 LDADD=	-lkrb -ldes
-BINDIR=	/usr/libexec
 NOMAN=	noman
 
 .include <bsd.prog.mk>
diff --git a/eBones/libexec/registerd/Makefile b/eBones/libexec/registerd/Makefile
index 9966241..af9e2ca 100644
--- a/eBones/libexec/registerd/Makefile
+++ b/eBones/libexec/registerd/Makefile
@@ -6,15 +6,13 @@
 #
 #	@(#)Makefile	8.1 (Berkeley) 6/1/93
 #
-# $Id$
+# $Id: Makefile,v 1.4 1995/09/13 17:24:03 markm Exp $
 
 PROG=	registerd
 SRCS=	registerd.c
-CFLAGS+=-DCRYPT -DKERBEROS -I${.CURDIR}/../../usr.bin/register \
-	-I${.CURDIR}/../../include -Wall
+CFLAGS+=-DCRYPT -DKERBEROS -I${.CURDIR}/../../usr.bin/register 
 DPADD+=	${LIBKDB} ${LIBKRB} ${LIBDES}
 LDADD=	-lkdb -lkrb -ldes
 MAN8=	registerd.8
-BINDIR=	/usr/libexec
 
 .include <bsd.prog.mk>
diff --git a/eBones/libexec/registerd/registerd.c b/eBones/libexec/registerd/registerd.c
index 12a3939..36c7a74 100644
--- a/eBones/libexec/registerd/registerd.c
+++ b/eBones/libexec/registerd/registerd.c
@@ -66,7 +66,7 @@ static char sccsid[] = "@(#)registerd.c	8.1 (Berkeley) 6/1/93";
 char	*progname, msgbuf[BUFSIZ];
 
 void cleanup(void);
-void die(void);
+void die(int);
 void send_packet(char *msg, int flag);
 int net_get_principal(char *pname, char *iname, C_Block *keyp);
 int do_append(struct sockaddr_in *sinp);
@@ -91,7 +91,7 @@ main(argc, argv)
 	signal(SIGHUP, SIG_IGN);
 	signal(SIGINT, SIG_IGN);
 	signal(SIGTSTP, SIG_IGN);
-	signal(SIGPIPE, (__sighandler_t *)die);
+	signal(SIGPIPE, die);
 
 	if (setrlimit(RLIMIT_CORE, &rl) < 0) {
 		syslog(LOG_ERR, "setrlimit: %m");
@@ -346,7 +346,8 @@ cleanup()
 }
 
 void
-die()
+die(sig)
+	int sig;
 {
 	syslog(LOG_ERR, "remote end died (SIGPIPE)");
 	cleanup();
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>