[src/trunk]: src/lib Too much magic involved - revert previous.

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

details:   https://anonhg.NetBSD.org/src/rev/09c423cee875
branches:  trunk
changeset: 445802:09c423cee875
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Nov 13 09:24:37 2018 +0000

description:
Too much magic involved - revert previous.

diffstat:

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

diffs (54 lines):

diff -r 950c91d8db0f -r 09c423cee875 lib/Makefile
--- a/lib/Makefile      Tue Nov 13 09:14:14 2018 +0000
+++ b/lib/Makefile      Tue Nov 13 09:24:37 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.264 2018/11/13 09:00:08 martin Exp $
+#      $NetBSD: Makefile,v 1.265 2018/11/13 09:24:37 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 libnvmm \
+               libintl libipsec libkvm libm \
                libossaudio libpci libposix libprop libpthread \
                libpuffs libresolv librmt librpcsvc librt \
                libtelnet libterminfo \
@@ -50,6 +50,10 @@
 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 950c91d8db0f -r 09c423cee875 lib/libnvmm/Makefile
--- a/lib/libnvmm/Makefile      Tue Nov 13 09:14:14 2018 +0000
+++ b/lib/libnvmm/Makefile      Tue Nov 13 09:24:37 2018 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2018/11/13 09:14:14 martin Exp $
+# $NetBSD: Makefile,v 1.5 2018/11/13 09:24:37 martin Exp $
 
 .include <bsd.own.mk>
 
-.if ${MACHINE_ARCH} == "x86_64" && ${MLIBDIR:Unone} != "i386"
-
 LIB=           nvmm
 MAN=           libnvmm.3
 
@@ -14,10 +12,4 @@
 
 WARNS=         5
 
-.else
-LIB=
-LIBDPLIBS=
-.endif
-
 .include <bsd.lib.mk>
-