Deleted Added
full compact
Makefile (210193) Makefile (212543)
1# $FreeBSD: head/sys/modules/zfs/Makefile 210193 2010-07-17 13:34:01Z nwhitehorn $
1# $FreeBSD: head/sys/modules/zfs/Makefile 212543 2010-09-13 07:29:02Z imp $
2
3KMOD= zfs
4
5SRCS= vnode_if.h
6
7SUNW= ${.CURDIR}/../../cddl/contrib/opensolaris
8
9.PATH: ${SUNW}/common/acl

--- 12 unchanged lines hidden (view full) ---

22SRCS+= opensolaris_lookup.c
23SRCS+= opensolaris_policy.c
24SRCS+= opensolaris_string.c
25SRCS+= opensolaris_taskq.c
26SRCS+= opensolaris_uio.c
27SRCS+= opensolaris_vfs.c
28SRCS+= opensolaris_zone.c
29
2
3KMOD= zfs
4
5SRCS= vnode_if.h
6
7SUNW= ${.CURDIR}/../../cddl/contrib/opensolaris
8
9.PATH: ${SUNW}/common/acl

--- 12 unchanged lines hidden (view full) ---

22SRCS+= opensolaris_lookup.c
23SRCS+= opensolaris_policy.c
24SRCS+= opensolaris_string.c
25SRCS+= opensolaris_taskq.c
26SRCS+= opensolaris_uio.c
27SRCS+= opensolaris_vfs.c
28SRCS+= opensolaris_zone.c
29
30.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "powerpc64"
31.PATH: ${SUNW}/common/atomic/${MACHINE_ARCH}
32SRCS+= opensolaris_atomic.S
30_A=${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic
31.if exists(${_A}/${MACHINE_CPUARCH}/opensolaris_atomic.S)
32.PATH: ${_A}/${MACHINE_CPUARCH}
33SRCS+= opensolaris_atomic.S
34.elif exists(${_A}/${MACHINE_ARCH}/opensolaris_atomic.S)
35.PATH: ${_A}/${MACHINE_ARCH}
36SRCS+= opensolaris_atomic.S
33.else
37.else
34.PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern
35SRCS+= opensolaris_atomic.c
38SRCS+= opensolaris_atomic.c
36.endif
37
38.PATH: ${SUNW}/uts/common/fs
39SRCS+= gfs.c
40SRCS+= vnode.c
41
42.PATH: ${SUNW}/uts/common/os
43SRCS+= callb.c

--- 53 unchanged lines hidden ---
39.endif
40
41.PATH: ${SUNW}/uts/common/fs
42SRCS+= gfs.c
43SRCS+= vnode.c
44
45.PATH: ${SUNW}/uts/common/os
46SRCS+= callb.c

--- 53 unchanged lines hidden ---