Module Name: src
Committed By: martin
Date: Tue Nov 13 09:24:37 UTC 2018
Modified Files:
src/lib: Makefile
src/lib/libnvmm: Makefile
Log Message:
Too much magic involved - revert previous.
To generate a diff of this commit:
cvs rdiff -u -r1.264 -r1.265 src/lib/Makefile
cvs rdiff -u -r1.4 -r1.5 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.264 src/lib/Makefile:1.265
--- src/lib/Makefile:1.264 Tue Nov 13 09:00:08 2018
+++ src/lib/Makefile Tue Nov 13 09:24:37 2018
@@ -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+= i18n_module
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+= 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.4 src/lib/libnvmm/Makefile:1.5
--- src/lib/libnvmm/Makefile:1.4 Tue Nov 13 09:14:14 2018
+++ src/lib/libnvmm/Makefile Tue Nov 13 09:24:37 2018
@@ -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 @@ INCSDIR= /usr/include
WARNS= 5
-.else
-LIB=
-LIBDPLIBS=
-.endif
-
.include <bsd.lib.mk>
-
