diff options
| author | Ryan Moeller <freqlabs@FreeBSD.org> | 2020-08-26 19:00:17 +0000 |
|---|---|---|
| committer | Ryan Moeller <freqlabs@FreeBSD.org> | 2020-08-26 19:00:17 +0000 |
| commit | 67c97ec2d606a50f2c288408773a53ad7fb8beee (patch) | |
| tree | 6bb903855e5174190c48c47443f689421a682225 /cddl | |
| parent | 48c376a6f17f97c66ece45053ee18cf8b80f4e0e (diff) | |
| download | src-test-67c97ec2d606a50f2c288408773a53ad7fb8beee.tar.gz src-test-67c97ec2d606a50f2c288408773a53ad7fb8beee.zip | |
Tidy up libzpool Makefile
Sponsored by: iXsystems, Inc.
Notes
Notes:
svn path=/head/; revision=364829
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/lib/libzpool/Makefile | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index db119b21b3575..536ad490fb2d0 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -1,16 +1,17 @@ # $FreeBSD$ +ZFSTOP= ${SRCTOP}/sys/contrib/openzfs # ZFS_COMMON_SRCS -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zfs -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zcommon -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/unicode +.PATH: ${ZFSTOP}/module/zfs +.PATH: ${ZFSTOP}/module/zcommon +.PATH: ${ZFSTOP}/module/unicode # LUA_SRCS -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/lua +.PATH: ${ZFSTOP}/module/lua -.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/linux/zfs +.PATH: ${ZFSTOP}/module/os/linux/zfs -.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzpool +.PATH: ${ZFSTOP}/lib/libzpool .if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} @@ -28,8 +29,6 @@ PICFLAG= -fPIC LIB= zpool - - USER_C = \ kernel.c \ taskq.c \ @@ -218,19 +217,19 @@ UNICODE_C = u8_textprep.c uconv.c SRCS= ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C} WARNS?= 2 -CFLAGS+= -DIN_BASE -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd -CFLAGS+= -I${SRCTOP}/sys -CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h -CFLAGS+= -DHAVE_ISSETUGID -CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h -CFLAGS+= -I${SRCTOP}/sys/modules/zfs -CFLAGS+= -DLIB_ZPOOL_BUILD -DZFS_DEBUG - +CFLAGS+= \ + -DIN_BASE \ + -I${ZFSTOP}/include \ + -I${ZFSTOP}/lib/libspl/include \ + -I${ZFSTOP}/lib/libspl/include/os/freebsd \ + -I${SRCTOP}/sys \ + -I${SRCTOP}/cddl/compat/opensolaris/include \ + -I${ZFSTOP}/module/icp/include \ + -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ + -DHAVE_ISSETUGID \ + -include ${SRCTOP}/sys/modules/zfs/zfs_config.h \ + -I${SRCTOP}/sys/modules/zfs \ + -DLIB_ZPOOL_BUILD -DZFS_DEBUG \ # XXX: pthread doesn't have mutex_owned() equivalent, so we need to look # into libthr private structures. That's sooo evil, but it's only for |