[src/trunk]: src/usr.sbin/mopd Put the NOAOUT in one place

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

details:   https://anonhg.NetBSD.org/src/rev/5f62d6fc5e50
branches:  trunk
changeset: 990634:5f62d6fc5e50
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Oct 31 18:06:42 2021 +0000

description:
Put the NOAOUT in one place

diffstat:

 usr.sbin/mopd/Makefile.inc      |   7 +++++--
 usr.sbin/mopd/common/Makefile   |  14 +++++---------
 usr.sbin/mopd/mopchk/Makefile   |   4 +++-
 usr.sbin/mopd/mopcopy/Makefile  |   9 +++------
 usr.sbin/mopd/mopd/Makefile     |   7 +++++--
 usr.sbin/mopd/mopprobe/Makefile |   7 +++++--
 usr.sbin/mopd/moptrace/Makefile |   4 +++-
 7 files changed, 29 insertions(+), 23 deletions(-)

diffs (126 lines):

diff -r ddf4dbdc196b -r 5f62d6fc5e50 usr.sbin/mopd/Makefile.inc
--- a/usr.sbin/mopd/Makefile.inc        Sun Oct 31 17:50:35 2021 +0000
+++ b/usr.sbin/mopd/Makefile.inc        Sun Oct 31 18:06:42 2021 +0000
@@ -1,8 +1,11 @@
-#      $NetBSD: Makefile.inc,v 1.11 2014/05/30 02:16:10 joerg Exp $
+#      $NetBSD: Makefile.inc,v 1.12 2021/10/31 18:06:42 christos Exp $
 
+USE_FORT?=yes  # network server
 .include <bsd.own.mk>
 
-USE_FORT?=yes  # network server
+.if ${MACHINE_CPU} == "mips"
+CPPFLAGS+= -DNOAOUT
+.endif
 
 LIBCOMMON != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
 CPPFLAGS+=-I${.CURDIR}/../common
diff -r ddf4dbdc196b -r 5f62d6fc5e50 usr.sbin/mopd/common/Makefile
--- a/usr.sbin/mopd/common/Makefile     Sun Oct 31 17:50:35 2021 +0000
+++ b/usr.sbin/mopd/common/Makefile     Sun Oct 31 18:06:42 2021 +0000
@@ -1,25 +1,21 @@
-#      $NetBSD: Makefile,v 1.22 2021/10/31 17:50:35 christos Exp $
+#      $NetBSD: Makefile,v 1.23 2021/10/31 18:06:42 christos Exp $
 
 LIBISPRIVATE=  yes
 
+.include <bsd.init.mk>
+
 LIB=   common
 SRCS=  cmp.c device.c dl.c file.c get.c log.c loop-bsd.c mopdef.c nma.c pf.c \
        print.c put.c rc.c version.c
 CLEANFILES= version.c
 
-.include <bsd.own.mk>
-
-.if ${MACHINE_CPU} == "mips"
-CPPFLAGS+= -DNOAOUT
-.endif
-
 version.c: VERSION
        ${_MKTARGET_CREATE}
        rm -f version.c; \
        ${TOOL_SED} 's/.*/char version[] = "&";/' ${.ALLSRC} > version.c
 
-.include <bsd.lib.mk>
 
 COPTS.print.c+=        -Wno-pointer-sign
+COPTS.pf.c+=   ${GCC_NO_STRINGOP_TRUNCATION}
 
-COPTS.pf.c+=   ${GCC_NO_STRINGOP_TRUNCATION}
+.include <bsd.lib.mk>
diff -r ddf4dbdc196b -r 5f62d6fc5e50 usr.sbin/mopd/mopchk/Makefile
--- a/usr.sbin/mopd/mopchk/Makefile     Sun Oct 31 17:50:35 2021 +0000
+++ b/usr.sbin/mopd/mopchk/Makefile     Sun Oct 31 18:06:42 2021 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: Makefile,v 1.6 1997/10/16 07:36:44 lukem Exp $
+#      $NetBSD: Makefile,v 1.7 2021/10/31 18:06:42 christos Exp $
+
+.include <bsd.init.mk>
 
 PROG=  mopchk
 
diff -r ddf4dbdc196b -r 5f62d6fc5e50 usr.sbin/mopd/mopcopy/Makefile
--- a/usr.sbin/mopd/mopcopy/Makefile    Sun Oct 31 17:50:35 2021 +0000
+++ b/usr.sbin/mopd/mopcopy/Makefile    Sun Oct 31 18:06:42 2021 +0000
@@ -1,10 +1,7 @@
-#      $NetBSD: Makefile,v 1.2 2009/08/20 22:26:19 he Exp $
+#      $NetBSD: Makefile,v 1.3 2021/10/31 18:06:42 christos Exp $
+
+.include <bsd.init.mk>
 
 PROG=  mopcopy
 
-.include <bsd.own.mk>
-.if ${MACHINE_CPU} == "mips"
-CFLAGS+= -DNOAOUT
-.endif
-
 .include <bsd.prog.mk>
diff -r ddf4dbdc196b -r 5f62d6fc5e50 usr.sbin/mopd/mopd/Makefile
--- a/usr.sbin/mopd/mopd/Makefile       Sun Oct 31 17:50:35 2021 +0000
+++ b/usr.sbin/mopd/mopd/Makefile       Sun Oct 31 18:06:42 2021 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: Makefile,v 1.13 2019/10/13 07:28:19 mrg Exp $
+#      $NetBSD: Makefile,v 1.14 2021/10/31 18:06:42 christos Exp $
+
+.include <bsd.init.mk>
 
 PROG=  mopd
 SRCS=  mopd.c process.c
@@ -7,6 +9,7 @@
 LDADD+=        -lutil
 DPADD+=        ${LIBUTIL}
 
+COPTS.process.c+=      -Wno-pointer-sign ${GCC_NO_FORMAT_TRUNCATION}
+
 .include <bsd.prog.mk>
 
-COPTS.process.c+=      -Wno-pointer-sign ${GCC_NO_FORMAT_TRUNCATION}
diff -r ddf4dbdc196b -r 5f62d6fc5e50 usr.sbin/mopd/mopprobe/Makefile
--- a/usr.sbin/mopd/mopprobe/Makefile   Sun Oct 31 17:50:35 2021 +0000
+++ b/usr.sbin/mopd/mopprobe/Makefile   Sun Oct 31 18:06:42 2021 +0000
@@ -1,7 +1,10 @@
-#      $NetBSD: Makefile,v 1.10 2012/08/10 12:10:29 joerg Exp $
+#      $NetBSD: Makefile,v 1.11 2021/10/31 18:06:42 christos Exp $
+
+.include <bsd.init.mk>
 
 PROG=  mopprobe
 
+COPTS.mopprobe.c+=     -Wno-pointer-sign
+
 .include <bsd.prog.mk>
 
-COPTS.mopprobe.c+=     -Wno-pointer-sign
diff -r ddf4dbdc196b -r 5f62d6fc5e50 usr.sbin/mopd/moptrace/Makefile
--- a/usr.sbin/mopd/moptrace/Makefile   Sun Oct 31 17:50:35 2021 +0000
+++ b/usr.sbin/mopd/moptrace/Makefile   Sun Oct 31 18:06:42 2021 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: Makefile,v 1.6 1997/10/16 07:37:09 lukem Exp $
+#      $NetBSD: Makefile,v 1.7 2021/10/31 18:06:42 christos Exp $
+
+.include <bsd.init.mk>
 
 PROG=  moptrace