diff options
| author | ngie <ngie@FreeBSD.org> | 2017-07-20 00:53:50 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-07-20 00:53:50 +0000 |
| commit | 97c764f8c94a61ea9c29267d332a2cacf2bd893c (patch) | |
| tree | 052c6a8b08bc1311440d99b7ff0de5888abfef26 /cddl/lib/libnvpair/Makefile | |
| parent | 6009405810445e7721f3faa706893ceba6f222d1 (diff) | |
| download | FreeBSD-src-97c764f8c94a61ea9c29267d332a2cacf2bd893c.zip FreeBSD-src-97c764f8c94a61ea9c29267d332a2cacf2bd893c.tar.gz | |
MFC r314654:
cddl: normalize paths using SRCTOP-relative paths or :H when possible
This simplifies make logic/output
While here, remove bogus CFLAGS which look for headers in cddl/lib/libumem.
There aren't any source files there (just Makefiles)
Diffstat (limited to 'cddl/lib/libnvpair/Makefile')
| -rw-r--r-- | cddl/lib/libnvpair/Makefile | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile index aef3f0b..3321e27 100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/nvpair +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/nvpair LIB= nvpair @@ -13,18 +13,18 @@ SRCS= libnvpair.c \ opensolaris_nvpair_alloc_fixed.c WARNS?= 1 -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -CFLAGS+= -I${.CURDIR}/../../../sys -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem # This library uses macros to define fprintf behavior for several object types # The compiler will see the non-string literal arguments to the fprintf calls and -# omit warnings for them. Quiesce these warnings in contrib code: +# omit warnings for them. Quiesce these warnings in contrib code: # # cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c:743:12: warning: format # string is not a string literal (potentially insecure) [-Wformat-security] |
