Be consistent how "multiple include protection" is implemented. I.e,

.if !defined(_BSD_foo_MK_)
	_BSD_foo_MK_=1

	# ...

	.endif	# !defined(_BSD_foo_MK_)
This commit is contained in:
lukem 2003-07-28 02:38:33 +00:00
parent 1372911937
commit 5e2ad4afcc
5 changed files with 20 additions and 16 deletions

View File

@ -1,11 +1,13 @@
# $NetBSD: bsd.init.mk,v 1.1 2001/11/02 05:21:50 tv Exp $
# $NetBSD: bsd.init.mk,v 1.2 2003/07/28 02:38:33 lukem Exp $
# <bsd.init.mk> includes Makefile.inc and <bsd.own.mk>; this is used at the
# top of all <bsd.*.mk> files which actually "build something".
.if !target(__initialized__)
__initialized__:
.if !defined(_BSD_INIT_MK_)
_BSD_INIT_MK_=1
.-include "${.CURDIR}/../Makefile.inc"
.include <bsd.own.mk>
.MAIN: all
.endif
.endif # !defined(_BSD_INIT_MK_)

View File

@ -1,7 +1,8 @@
# $NetBSD: bsd.obj.mk,v 1.43 2003/07/28 00:57:25 lukem Exp $
# $NetBSD: bsd.obj.mk,v 1.44 2003/07/28 02:38:33 lukem Exp $
.if !defined(_BSD_OBJ_MK_)
_BSD_OBJ_MK_=1
.if !target(__initialized_obj__)
__initialized_obj__:
.include <bsd.own.mk>
__curdir:= ${.CURDIR}
@ -102,4 +103,5 @@ print-objdir:
@echo ${.OBJDIR}
.include <bsd.sys.mk>
.endif
.endif # !defined(_BSD_OBJ_MK_)

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.own.mk,v 1.346 2003/07/27 14:49:22 mrg Exp $
# $NetBSD: bsd.own.mk,v 1.347 2003/07/28 02:38:33 lukem Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@ -643,4 +643,4 @@ USE_${var}?= yes
USE_XF86_4?= yes
.endif
.endif # _BSD_OWN_MK_
.endif # !defined(_BSD_OWN_MK_)

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.shlib.mk,v 1.1 2002/09/27 21:37:58 thorpej Exp $
# $NetBSD: bsd.shlib.mk,v 1.2 2003/07/28 02:38:33 lukem Exp $
.if !defined(_BSD_SHLIB_MK_)
_BSD_SHLIB_MK_=1
@ -35,4 +35,4 @@ SHLINKDIR?= /usr/libexec
SHLINKDIR?= /libexec
.endif
.endif # _BSD_SHLIB_MK_
.endif # !defined(_BSD_SHLIB_MK_)

View File

@ -1,9 +1,9 @@
# $NetBSD: bsd.sys.mk,v 1.93 2003/07/22 06:53:23 lukem Exp $
# $NetBSD: bsd.sys.mk,v 1.94 2003/07/28 02:38:33 lukem Exp $
#
# Build definitions used for NetBSD source tree builds.
.if !target(__bsd_sys_mk__)
__bsd_sys_mk__:
.if !defined(_BSD_SYS_MK_)
_BSD_SYS_MK_=1
.if defined(WARNS)
.if ${WARNS} > 0
@ -182,4 +182,4 @@ YFLAGS+= ${YPREFIX:D-p${YPREFIX}} ${YHEADER:D-d}
.y.h: ${.TARGET:.h=.c}
.endif
.endif # __bsd_sys_mk__
.endif # !defined(_BSD_SYS_MK_)