summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2018-11-13 09:00:08 +0000
committermartin <martin@NetBSD.org>2018-11-13 09:00:08 +0000
commitc6a7e7d82e8410a3e74415f778ec2dd9f32a06ed (patch)
treee899a8b114ec31fba3802379f2d624cfc11cc86a /lib
parentcff366484efae53f3e498a50fed04de7e3ec3771 (diff)
Move conditionals for libnvmm to subdir makefile, requested boy mrg.
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile8
-rw-r--r--lib/libnvmm/Makefile6
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 7af9b5b6752..fd285c773bb 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -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+= i18n_module
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+= librumpclient
SUBDIR+= libskey
.endif
-.if ${MACHINE_ARCH} == "x86_64" && ${MLIBDIR:Unone} != "i386"
-SUBDIR+= libnvmm
-.endif
-
.if (${MKMDNS} != "no")
SUBDIR+= ../external/apache2/mDNSResponder/lib
.endif
diff --git a/lib/libnvmm/Makefile b/lib/libnvmm/Makefile
index e51026b49fb..871951d136d 100644
--- a/lib/libnvmm/Makefile
+++ b/lib/libnvmm/Makefile
@@ -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 @@ INCSDIR= /usr/include
WARNS= 5
.include <bsd.lib.mk>
+
+.endif