summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortv <tv@NetBSD.org>2001-12-11 23:25:23 +0000
committertv <tv@NetBSD.org>2001-12-11 23:25:23 +0000
commite690fbabcd9923d3af8d12913030e60c3e7af8a2 (patch)
treef7c6634bcf25b3b733e2dc63ae2829a321db9df3
parent1ad59a57f2bb234f351cc3f77ea63f38313cc34d (diff)
Major readability cleanups.
-rw-r--r--share/mk/bsd.own.mk147
1 files changed, 44 insertions, 103 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 4842351679e..f9a32ab2292 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.229 2001/12/07 02:28:53 jmc Exp $
+# $NetBSD: bsd.own.mk,v 1.230 2001/12/11 23:25:23 tv Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -223,24 +223,25 @@ HOST_INSTALL_FILE?= ${INSTALL} ${COPY} ${PRESERVE} ${RENAME}
# The sh3 port is incomplete.
.if ${MACHINE_ARCH} == "sh3eb" || ${MACHINE_ARCH} == "sh3el"
-NOLINT=1
-NOPROFILE=1
-OBJECT_FMT?=COFF
-NOPIC?=1
+NOLINT= # defined
+NOPIC= # defined
+NOPROFILE= # defined
+OBJECT_FMT?= COFF
.endif
# Profiling and linting is also off on the x86_64 port at the moment.
# The x86_64 port is incomplete.
.if ${MACHINE_ARCH} == "x86_64"
-NOPROFILE=1
-NOLINT=1
+NOPROFILE= # defined
+NOLINT= # defined
+CFLAGS+= -Wno-format -fno-builtin
.endif
# The m68000 port is incomplete.
.if ${MACHINE_ARCH} == "m68000"
-NOLINT=1
-NOPROFILE=1
-NOPIC?=1
+NOLINT= # defined
+NOPIC= # defined
+NOPROFILE= # defined
.endif
# Data-driven table using make variables to control how
@@ -265,13 +266,9 @@ NOPIC?=1
${MACHINE} == "news68k" || \
${MACHINE} == "cesfic" || \
${MACHINE} == "atari"
-OBJECT_FMT?=ELF
+OBJECT_FMT?= ELF
.else
-OBJECT_FMT?=a.out
-.endif
-
-.if ${MACHINE_ARCH} == "x86_64"
-CFLAGS+=-Wno-format -fno-builtin
+OBJECT_FMT?= a.out
.endif
# Location of the file that contains the major and minor numbers of the
@@ -336,106 +333,50 @@ dependall: .NOTMAIN realdepend .MAKE
# The NOxxx variables should only be used by Makefiles.
#
-MKCATPAGES?=yes
-
-.if defined(NODOC)
-MKDOC=no
-.else
-MKDOC?=yes
-.endif
-
-MKINFO?=yes
-
-.if defined(NOLINKLIB)
-MKLINKLIB=no
-.else
-MKLINKLIB?=yes
-.endif
-.if ${MKLINKLIB} == "no"
-MKPICINSTALL=no
-MKPROFILE=no
+# Supported NO* options (if defined, MK* will be forced to "no",
+# regardless of user's mk.conf setting).
+.for var in CRYPTO DOC KERBEROS LINKLIB LINT MAN NLS OBJ \
+ PIC PICINSTALL PROFILE SHARE
+.if defined(NO${var})
+MK${var}:= no
.endif
+.endfor
-.if defined(NOLINT)
-MKLINT=no
-.else
-MKLINT?=yes
-.endif
+# MK* options which default to "yes".
+.for var in CATPAGES CRYPTO DOC INFO KERBEROS LINKLIB LINT \
+ MAN NLS OBJ PIC PICINSTALL PROFILE SHARE
+MK${var}?= yes
+.endfor
-.if defined(NOMAN)
-MKMAN=no
-.else
-MKMAN?=yes
-.endif
-.if ${MKMAN} == "no"
-MKCATPAGES=no
-.endif
+# MK* options which default to "no".
+.for var in CRYPTO_IDEA CRYPTO_RC5 OBJDIRS SOFTFLOAT
+MK${var}?= no
+.endfor
-.if defined(NONLS)
-MKNLS=no
-.else
-MKNLS?=yes
+# Force some options off if their dependencies are off.
+.if ${MKCRYPTO} == "no"
+MKKERBEROS:= no
.endif
-#
-# MKOBJDIRS controls whether object dirs are created during "make build".
-# MKOBJ controls whether the "make obj" rule does anything.
-#
-.if defined(NOOBJ)
-MKOBJ=no
-MKOBJDIRS=no
-.else
-MKOBJ?=yes
-MKOBJDIRS?=no
-.endif
-
-.if defined(NOPIC)
-MKPIC=no
-.else
-MKPIC?=yes
+.if ${MKLINKLIB} == "no"
+MKPICINSTALL:= no
+MKPROFILE:= no
.endif
-.if defined(NOPICINSTALL)
-MKPICINSTALL=no
-.else
-MKPICINSTALL?=yes
+.if ${MKMAN} == "no"
+MKCATPAGES:= no
.endif
-.if defined(NOPROFILE)
-MKPROFILE=no
-.else
-MKPROFILE?=yes
+.if ${MKOBJ} == "no"
+MKOBJDIRS:= no
.endif
-.if defined(NOSHARE)
-MKSHARE=no
-.else
-MKSHARE?=yes
-.endif
.if ${MKSHARE} == "no"
-MKCATPAGES=no
-MKDOC=no
-MKINFO=no
-MKMAN=no
-MKNLS=no
+MKCATPAGES:= no
+MKDOC:= no
+MKINFO:= no
+MKMAN:= no
+MKNLS:= no
.endif
-.if defined(NOCRYPTO)
-MKCRYPTO=no
-.else
-MKCRYPTO?=yes
-.endif
-
-MKCRYPTO_IDEA?=no
-
-MKCRYPTO_RC5?=no
-
-.if defined(NOKERBEROS) || (${MKCRYPTO} == "no")
-MKKERBEROS=no
-.else
-MKKERBEROS?=yes
-.endif
-
-MKSOFTFLOAT?=no
-
.endif # _BSD_OWN_MK_