Module Name: src
Committed By: christos
Date: Fri Sep 17 14:48:32 UTC 2021
Modified Files:
src/usr.sbin/fstyp: Makefile
Log Message:
Use CPPFLAGS for -D and -I so that lint works.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/fstyp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/fstyp/Makefile
diff -u src/usr.sbin/fstyp/Makefile:1.11 src/usr.sbin/fstyp/Makefile:1.12
--- src/usr.sbin/fstyp/Makefile:1.11 Tue Feb 2 16:31:11 2021
+++ src/usr.sbin/fstyp/Makefile Fri Sep 17 10:48:31 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/02/02 21:31:11 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2021/09/17 14:48:31 christos Exp $
.include <bsd.own.mk>
@@ -14,19 +14,21 @@ MAN= fstyp.8
WARNS?= 6
.if (${MKZFS} != "no")
-CFLAGS+= -DHAVE_ZFS
COPTS.zfs.c+= -Wno-unknown-pragmas
COPTS.zfs.c+= -Wno-sign-conversion
COPTS.zfs.c+= -Wno-strict-prototypes
-COPTS.zfs.c+= -I${NETBSDSRCDIR}/external
-COPTS.zfs.c+= -I${NETBSDSRCDIR}/external/cddl/osnet/include
-COPTS.zfs.c+= -I${NETBSDSRCDIR}/external/cddl/osnet/sys
-COPTS.zfs.c+= -I${NETBSDSRCDIR}/external/cddl/osnet/dist/head
-COPTS.zfs.c+= -I${NETBSDSRCDIR}/external/cddl/osnet/dist/lib/libzpool/common
-COPTS.zfs.c+= -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
-COPTS.zfs.c+= -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common/fs/zfs
-COPTS.zfs.c+= -I${NETBSDSRCDIR}/external/cddl/osnet/dist/lib/libnvpair
LDADD+= -lnvpair -lzfs
+
+OSNET=${NETBSDSRCDIR}/external/cddl/osnet
+CPPFLAGS+= -DHAVE_ZFS
+CPPFLAGS.zfs.c+= -I${NETBSDSRCDIR}/external
+CPPFLAGS.zfs.c+= -I${OSNET}/include
+CPPFLAGS.zfs.c+= -I${OSNET}/sys
+CPPFLAGS.zfs.c+= -I${OSNET}/dist/head
+CPPFLAGS.zfs.c+= -I${OSNET}/dist/lib/libzpool/common
+CPPFLAGS.zfs.c+= -I${OSNET}/dist/uts/common
+CPPFLAGS.zfs.c+= -I${OSNET}/dist/uts/common/fs/zfs
+CPPFLAGS.zfs.c+= -I${OSNET}/dist/lib/libnvpair
.endif
CWARNFLAGS.clang+= -Wno-unknown-pragmas -Wno-error=address-of-packed-member
