Module Name: src
Committed By: martin
Date: Tue Nov 13 09:00:09 UTC 2018
Modified Files:
src/lib: Makefile
src/lib/libnvmm: Makefile
Log Message:
Move conditionals for libnvmm to subdir makefile, requested boy mrg.
To generate a diff of this commit:
cvs rdiff -u -r1.263 -r1.264 src/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/lib/libnvmm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.263 src/lib/Makefile:1.264
--- src/lib/Makefile:1.263 Mon Nov 12 09:25:42 2018
+++ src/lib/Makefile Tue Nov 13 09:00:08 2018
@@ -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
Index: src/lib/libnvmm/Makefile
diff -u src/lib/libnvmm/Makefile:1.2 src/lib/libnvmm/Makefile:1.3
--- src/lib/libnvmm/Makefile:1.2 Mon Nov 12 17:46:53 2018
+++ src/lib/libnvmm/Makefile Tue Nov 13 09:00:09 2018
@@ -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
