[src/trunk]: src/share/mk Simplify many .if's by collapsing to make :D and :U...

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e3f4688a0c74
branches:  trunk
changeset: 516261:e3f4688a0c74
user:      tv <tv%NetBSD.org@localhost>
date:      Fri Oct 19 16:28:54 2001 +0000

description:
Simplify many .if's by collapsing to make :D and :U conditionals.

diffstat:

 share/mk/bsd.sys.mk |  17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diffs (33 lines):

diff -r 9d120abe29be -r e3f4688a0c74 share/mk/bsd.sys.mk
--- a/share/mk/bsd.sys.mk       Fri Oct 19 16:15:40 2001 +0000
+++ b/share/mk/bsd.sys.mk       Fri Oct 19 16:28:54 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.sys.mk,v 1.52 2001/10/19 16:15:40 tv Exp $
+#      $NetBSD: bsd.sys.mk,v 1.53 2001/10/19 16:28:54 tv Exp $
 #
 # Overrides used for NetBSD source tree builds.
 
@@ -22,19 +22,12 @@
 .endif
 .endif
 
-.if !defined(NOGCCERROR)
-CFLAGS+= -Werror
-.endif
-CFLAGS+= ${CWARNFLAGS}
+CPPFLAGS+=     ${AUDIT:D-D__AUDIT__} \
+               ${DESTDIR:D-nostdinc -idirafter ${DESTDIR}/usr/include}
 
-.if defined(DESTDIR)
-CPPFLAGS+= -nostdinc -idirafter ${DESTDIR}/usr/include
-LINTFLAGS+= -d ${DESTDIR}/usr/include
-.endif
+CFLAGS+=       ${NOGCCERROR:U-Werror} ${CWARNFLAGS}
 
-.if defined(AUDIT)
-CPPFLAGS+= -D__AUDIT__
-.endif
+LINTFLAGS+=    ${DESTDIR:D-d ${DESTDIR}/usr/include}
 
 .if defined(MKSOFTFLOAT) && (${MKSOFTFLOAT} != "no")
 COPTS+=                -msoft-float