Tue Aug 27 14:53:38 2019 UTC ()
Move common parts into a makefile fragment usable from elsewhere.
Suggested by mrg.


(martin)
diff -r1.2 -r1.3 src/external/bsd/libnv/lib/Makefile
diff -r0 -r1.1 src/external/bsd/libnv/lib/srcs.mk

cvs diff -r1.2 -r1.3 src/external/bsd/libnv/lib/Makefile (expand / switch to unified diff)

--- src/external/bsd/libnv/lib/Makefile 2019/02/17 23:54:08 1.2
+++ src/external/bsd/libnv/lib/Makefile 2019/08/27 14:53:38 1.3
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.2 2019/02/17 23:54:08 bad Exp $ 1# $NetBSD: Makefile,v 1.3 2019/08/27 14:53:38 martin Exp $
2 2
3WARNS?= 5 3WARNS?= 5
4 4
5.include <bsd.init.mk> 5.include <bsd.init.mk>
6 6
7.if ${RUMPRUN:Uno} != "yes" 7.if ${RUMPRUN:Uno} != "yes"
8LIBISPRIVATE?= yes 8LIBISPRIVATE?= yes
9.endif 9.endif
10LIB= nv 10LIB= nv
11#USE_SHLIBDIR= yes 11#USE_SHLIBDIR= yes
12#SHLIB_MAJOR= 1 12#SHLIB_MAJOR= 1
13#SHLIB_MINOR= 0 13#SHLIB_MINOR= 0
14 14
15#INCS= nv.h dnv.h 15#INCS= nv.h dnv.h
16#INCSDIR= /usr/include 16#INCSDIR= /usr/include
17#MAN= nv.3 17#MAN= nv.3
18 18
19SRCS= dnvlist.c msgio.c nvlist.c nvpair.c nv_kern_netbsd.c 19.include "srcs.mk"
 20SRCS= ${LIBNV_SRCS}
20 21
21.include <bsd.lib.mk> 22.include <bsd.lib.mk>

File Added: src/external/bsd/libnv/lib/srcs.mk
#	$NetBSD: srcs.mk,v 1.1 2019/08/27 14:53:38 martin Exp $

# Sources and additional flags for libnv

LIBNV_SRCS=	dnvlist.c msgio.c nvlist.c nvpair.c nv_kern_netbsd.c
NVSRC_DISTPATH=	${NETBSDSRCDIR}/sys/external/bsd/libnv/dist

.for _s in ${LIBNV_SRCS}
CPPFLAGS.${_s}	+=	-I${NVSRC_DISTPATH}
.endfor

.PATH:	${NVSRC_DISTPATH}