diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index 91d4ee2e7505..c94ba1036e71 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.dep.mk,v 1.11 1997/04/09 16:10:23 bde Exp $
+#	$Id: bsd.dep.mk,v 1.12 1997/04/13 06:44:20 jkh Exp $
 #
 # The include file <bsd.dep.mk> handles Makefile dependencies.
 #
@@ -44,16 +44,16 @@ __depend_cc=	${SRCS:M*.cc} ${SRCS:M*.C} ${SRCS:M*.cxx}
 ${DEPENDFILE}: ${SRCS}
 	rm -f ${DEPENDFILE}
 .if defined(__depend_s) && !empty(__depend_s)
-	${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} ${CFLAGS:M-[ID]*} ${AINC} \
+	${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} ${CFLAGS:M-[BID]*} ${AINC} \
 		${.ALLSRC:M*.[sS]}
 .endif
 .if defined(__depend_c) && !empty(__depend_c)
-	${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} ${CFLAGS:M-[ID]*} \
+	${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} ${CFLAGS:M-[BID]*} \
 		${.ALLSRC:M*.c}
 .endif
 .if defined(__depend_cc) && !empty(__depend_cc)
 	${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \
-		${CXXFLAGS:M-nostd*} ${CXXFLAGS:M-[ID]*} \
+		${CXXFLAGS:M-nostd*} ${CXXFLAGS:M-[BID]*} \
 		${.ALLSRC:M*.cc} ${.ALLSRC:M*.C} ${.ALLSRC:M*.cxx}
 .endif
 .if target(_EXTRADEPEND)
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index c386124965ef..4917efddfaf6 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
-#	$Id: bsd.lib.mk,v 1.56 1997/05/23 08:38:46 asami Exp $
+#	$Id: bsd.lib.mk,v 1.57 1997/05/23 17:50:35 dfr Exp $
 #
 
 .if exists(${.CURDIR}/../Makefile.inc)
@@ -70,30 +70,30 @@ STRIP?=	-s
 	@${LD} -O ${.TARGET} -x -r ${.TARGET}
 
 .s.o:
-	${CC} -x assembler-with-cpp ${CFLAGS:M-[ID]*} ${AINC} -c \
+	${CC} -x assembler-with-cpp ${CFLAGS:M-[BID]*} ${AINC} -c \
 	    ${.IMPSRC} -o ${.TARGET}
 	@${LD} -O ${.TARGET} -x -r ${.TARGET}
 
 .s.po:
-	${CC} -x assembler-with-cpp -DPROF ${CFLAGS:M-[ID]*} ${AINC} -c \
+	${CC} -x assembler-with-cpp -DPROF ${CFLAGS:M-[BID]*} ${AINC} -c \
 	    ${.IMPSRC} -o ${.TARGET}
 	@${LD} -O ${.TARGET} -X -r ${.TARGET}
 
 .s.so:
-	${CC} -x assembler-with-cpp -fpic -DPIC ${CFLAGS:M-[ID]*} ${AINC} -c \
+	${CC} -x assembler-with-cpp -fpic -DPIC ${CFLAGS:M-[BID]*} ${AINC} -c \
 	    ${.IMPSRC} -o ${.TARGET}
 	@${LD} -O ${.TARGET} -x -r ${.TARGET}
 
 .S.o:
-	${CC} ${CFLAGS:M-[ID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET}
+	${CC} ${CFLAGS:M-[BID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET}
 	@${LD} -O ${.TARGET} -x -r ${.TARGET}
 
 .S.po:
-	${CC} -DPROF ${CFLAGS:M-[ID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET}
+	${CC} -DPROF ${CFLAGS:M-[BID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET}
 	@${LD} -O ${.TARGET} -X -r ${.TARGET}
 
 .S.so:
-	${CC} -fpic -DPIC ${CFLAGS:M-[ID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET}
+	${CC} -fpic -DPIC ${CFLAGS:M-[BID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET}
 	@${LD} -O ${.TARGET} -x -r ${.TARGET}
 
 .m.o: