Bmake fixes for the eBones tree.

5 files changed, 19 insertions, 25 deletions

diff --git a/eBones/lib/Makefile.inc b/eBones/lib/Makefile.inc
index 62677fda48f3..b0b4ed25a290 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 3eefb2f83e23..7fa05c06a09c 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 45e6d04a66fe..f015f964cce5 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 b2b3314529ff..29beb2401b30 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 82d6a1ce3a88..eefe1a55d9b3 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
+