[src/trunk]: src/lib Move conditionals for libnvmm to subdir makefile, reques...

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

details:   https://anonhg.NetBSD.org/src/rev/6133425d6ffd
branches:  trunk
changeset: 445800:6133425d6ffd
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Nov 13 09:00:08 2018 +0000

description:
Move conditionals for libnvmm to subdir makefile, requested boy mrg.

diffstat:

 lib/Makefile         |  8 ++------
 lib/libnvmm/Makefile |  6 +++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (46 lines):

diff -r 8ccfb28f22a6 -r 6133425d6ffd lib/Makefile
--- a/lib/Makefile      Tue Nov 13 07:45:43 2018 +0000
+++ b/lib/Makefile      Tue Nov 13 09:00:08 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.263 2018/11/12 09:25:42 martin Exp $
+#      $NetBSD: Makefile,v 1.264 2018/11/13 09:00:08 martin Exp $
 #      from: @(#)Makefile      5.25.1.1 (Berkeley) 5/7/91
 
 .include <bsd.own.mk>
@@ -23,7 +23,7 @@
 SUBDIR+=       libarch \
                libbluetooth libbsdmalloc libbz2 \
                libcompat libcrypt \
-               libintl libipsec libkvm libm \
+               libintl libipsec libkvm libm libnvmm \
                libossaudio libpci libposix libprop libpthread \
                libpuffs libresolv librmt librpcsvc librt \
                libtelnet libterminfo \
@@ -50,10 +50,6 @@
 SUBDIR+=       libskey
 .endif
 
-.if ${MACHINE_ARCH} == "x86_64" && ${MLIBDIR:Unone} != "i386"
-SUBDIR+=       libnvmm
-.endif
-
 .if (${MKMDNS} != "no")
 SUBDIR+=       ../external/apache2/mDNSResponder/lib
 .endif
diff -r 8ccfb28f22a6 -r 6133425d6ffd lib/libnvmm/Makefile
--- a/lib/libnvmm/Makefile      Tue Nov 13 07:45:43 2018 +0000
+++ b/lib/libnvmm/Makefile      Tue Nov 13 09:00:08 2018 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2018/11/12 17:46:53 nakayama Exp $
+# $NetBSD: Makefile,v 1.3 2018/11/13 09:00:09 martin Exp $
+
+.if ${MACHINE_ARCH} == "x86_64" && ${MLIBDIR:Unone} != "i386"
 
 .include <bsd.own.mk>
 
@@ -13,3 +15,5 @@
 WARNS=         5
 
 .include <bsd.lib.mk>
+
+.endif