-DROKEN_RENAME not needed for these.

ok hin@

7 files changed, 14 insertions, 15 deletions

diff --git a/kerberosV/lib/45/Makefile b/kerberosV/lib/45/Makefile
index aad7fb90204..75b91485c7b 100644
--- a/kerberosV/lib/45/Makefile
+++ b/kerberosV/lib/45/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2003/05/11 03:47:55 hin Exp $
+# $OpenBSD: Makefile,v 1.3 2003/05/11 20:54:39 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -7,6 +7,6 @@ LIB=	45
 SRCS=	get_ad_tkt.c mk_req.c
 
 .PATH:	${KRB5SRC}/lib/45
-CFLAGS+=-I${KRB5SRC}/lib/krb5 -I../krb5 -I../asn1 -DROKEN_RENAME
+CFLAGS+=-I${KRB5SRC}/lib/krb5 -I../krb5 -I../asn1
 
 .include <bsd.lib.mk>
diff --git a/kerberosV/lib/asn1/Makefile b/kerberosV/lib/asn1/Makefile
index 2f3e485579d..d2341565875 100644
--- a/kerberosV/lib/asn1/Makefile
+++ b/kerberosV/lib/asn1/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2003/05/11 03:47:55 hin Exp $
+# $OpenBSD: Makefile,v 1.7 2003/05/11 20:54:39 mho Exp $
 
 LIB=	asn1
 
@@ -79,7 +79,7 @@ SRCS=	der_get.c \
 	der_copy.c \
 	${BUILT_SOURCES}
 
-CFLAGS+=	-I${KRB5SRC}/lib/asn1 -I. -DROKEN_RENAME
+CFLAGS+=	-I${KRB5SRC}/lib/asn1 -I.
 
 asn1_err.h asn1_err.c:	${KRB5SRC}/lib/asn1/asn1_err.et
 	compile_et ${KRB5SRC}/lib/asn1/asn1_err.et
diff --git a/kerberosV/lib/gssapi/Makefile b/kerberosV/lib/gssapi/Makefile
index ed7feb89063..cf269e07942 100644
--- a/kerberosV/lib/gssapi/Makefile
+++ b/kerberosV/lib/gssapi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2003/05/11 03:47:55 hin Exp $
+# $OpenBSD: Makefile,v 1.3 2003/05/11 20:54:39 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -54,6 +54,6 @@ SRCS=	8003.c			\
 .PATH:	${KRB5SRC}/lib/gssapi
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/ \
 	-I${KRB5SRC}/lib/asn1 -I../asn1 -I. \
-	-DSHA1_CTX=SHA_CTX -DROKEN_RENAME
+	-DSHA1_CTX=SHA_CTX
 
 .include <bsd.lib.mk>
diff --git a/kerberosV/lib/hdb/Makefile b/kerberosV/lib/hdb/Makefile
index 6a6323c7d79..b791957bc3a 100644
--- a/kerberosV/lib/hdb/Makefile
+++ b/kerberosV/lib/hdb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2003/05/11 03:47:55 hin Exp $
+# $OpenBSD: Makefile,v 1.6 2003/05/11 20:54:39 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -33,8 +33,8 @@ ${ASN1_SRC}:	${KRB5SRC}/lib/hdb/hdb.asn1
 CLEANFILES+=	${ASN1_SRC} ${ASN1_SRC:.c=.x} hdb_err.[ch] \
 		hdb_asn1.[ch] ans1_files asn1.h asn1_files
 
-CFLAGS+=-I${KRB5SRC}/lib/hdb -I${KRB5SRC}/lib/asn1 -I../asn1 -I. -I../krb5 \
-	-DROKEN_RENAME
+CFLAGS+=-I${KRB5SRC}/lib/hdb -I${KRB5SRC}/lib/asn1 -I../asn1 -I. -I../krb5
+
 .PATH:	${KRB5SRC}/lib/hdb
 
 hdb_err.c hdb_err.h: ${KRB5SRC}/lib/hdb/hdb_err.et
diff --git a/kerberosV/lib/kadm5clnt/Makefile b/kerberosV/lib/kadm5clnt/Makefile
index 9d8e2f3a6f9..261bbc0bdc4 100644
--- a/kerberosV/lib/kadm5clnt/Makefile
+++ b/kerberosV/lib/kadm5clnt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2003/05/11 03:47:55 hin Exp $
+# $OpenBSD: Makefile,v 1.7 2003/05/11 20:54:39 mho Exp $
 
 LIB=	kadm5clnt
 
@@ -36,7 +36,7 @@ SRCS=	admin.h         \
 .PATH:	${KRB5SRC}/lib/kadm5
 
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/asn1 -I../asn1 -I../krb5 \
-	-I${KRB5SRC}/lib/hdb -I../hdb -I. -DROKEN_RENAME
+	-I${KRB5SRC}/lib/hdb -I../hdb -I.
 
 CLEANFILES+=kadm5_err.[ch]
 
diff --git a/kerberosV/lib/kadm5srv/Makefile b/kerberosV/lib/kadm5srv/Makefile
index 5a5952b0134..6f9215abd9c 100644
--- a/kerberosV/lib/kadm5srv/Makefile
+++ b/kerberosV/lib/kadm5srv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2003/05/11 03:47:55 hin Exp $
+# $OpenBSD: Makefile,v 1.6 2003/05/11 20:54:39 mho Exp $
 
 LIB=	kadm5srv
 
@@ -46,7 +46,7 @@ SRCS=	acl.c           \
 .PATH:	${KRB5SRC}/lib/kadm5
 
 CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/asn1 -I../asn1 -I../krb5 \
-	-I${KRB5SRC}/lib/hdb -I../hdb -I. -DROKEN_RENAME
+	-I${KRB5SRC}/lib/hdb -I../hdb -I.
 
 CLEANFILES+=kadm5_err.[ch]
 
diff --git a/kerberosV/lib/krb5/Makefile b/kerberosV/lib/krb5/Makefile
index c75d2cb6a6b..7d1adb4c5dd 100644
--- a/kerberosV/lib/krb5/Makefile
+++ b/kerberosV/lib/krb5/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.22 2003/05/11 03:47:55 hin Exp $
+# $OpenBSD: Makefile,v 1.23 2003/05/11 20:54:39 mho Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
 
-CFLAGS+= -DROKEN_RENAME
 LIB=	krb5
 
 INCLUDE_FILES=	${KRB5SRC}/lib/krb5/{krb5.h,krb5-protos.h,krb5-private.h} \