Deleted Added
sdiff udiff text old ( 263219 ) new ( 269130 )
full compact
Makefile (263219) Makefile (269130)
1# $FreeBSD: head/sys/modules/zfs/Makefile 263219 2014-03-16 01:55:30Z jmg $
1# $FreeBSD: head/sys/modules/zfs/Makefile 269130 2014-07-26 17:24:58Z marcel $
2
2
3SYSDIR?=${.CURDIR}/../..
4
3KMOD= zfs
4
5SRCS= bus_if.h device_if.h vnode_if.h
6
5KMOD= zfs
6
7SRCS= bus_if.h device_if.h vnode_if.h
8
7SUNW= ${.CURDIR}/../../cddl/contrib/opensolaris
9SUNW= ${SYSDIR}/cddl/contrib/opensolaris
8
9.PATH: ${SUNW}/common/acl
10SRCS+= acl_common.c
11.PATH: ${SUNW}/common/avl
12SRCS+= avl.c
13.PATH: ${SUNW}/common/nvpair
14SRCS+= nvpair.c
15SRCS+= nvpair_alloc_fixed.c
16SRCS+= fnvpair.c
10
11.PATH: ${SUNW}/common/acl
12SRCS+= acl_common.c
13.PATH: ${SUNW}/common/avl
14SRCS+= avl.c
15.PATH: ${SUNW}/common/nvpair
16SRCS+= nvpair.c
17SRCS+= nvpair_alloc_fixed.c
18SRCS+= fnvpair.c
17.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/unicode
19.PATH: ${SYSDIR}/cddl/contrib/opensolaris/common/unicode
18SRCS+= u8_textprep.c
19
20SRCS+= u8_textprep.c
21
20.PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern
22.PATH: ${SYSDIR}/cddl/compat/opensolaris/kern
21SRCS+= opensolaris_acl.c
22SRCS+= opensolaris_kobj.c
23SRCS+= opensolaris_kstat.c
24SRCS+= opensolaris_lookup.c
25SRCS+= opensolaris_policy.c
26SRCS+= opensolaris_string.c
27SRCS+= opensolaris_sysevent.c
28SRCS+= opensolaris_taskq.c
29SRCS+= opensolaris_uio.c
30SRCS+= opensolaris_vfs.c
31SRCS+= opensolaris_vm.c
32SRCS+= opensolaris_zone.c
33
23SRCS+= opensolaris_acl.c
24SRCS+= opensolaris_kobj.c
25SRCS+= opensolaris_kstat.c
26SRCS+= opensolaris_lookup.c
27SRCS+= opensolaris_policy.c
28SRCS+= opensolaris_string.c
29SRCS+= opensolaris_sysevent.c
30SRCS+= opensolaris_taskq.c
31SRCS+= opensolaris_uio.c
32SRCS+= opensolaris_vfs.c
33SRCS+= opensolaris_vm.c
34SRCS+= opensolaris_zone.c
35
34_A=${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic
36_A=${SYSDIR}/cddl/contrib/opensolaris/common/atomic
35.if exists(${_A}/${MACHINE_CPUARCH}/opensolaris_atomic.S)
36.PATH: ${_A}/${MACHINE_CPUARCH}
37SRCS+= opensolaris_atomic.S
38.elif exists(${_A}/${MACHINE_ARCH}/opensolaris_atomic.S)
39.PATH: ${_A}/${MACHINE_ARCH}
40SRCS+= opensolaris_atomic.S
41.else
42SRCS+= opensolaris_atomic.c

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

59SRCS+= inffast.c
60SRCS+= inflate.c
61SRCS+= inftrees.c
62SRCS+= trees.c
63SRCS+= zmod.c
64SRCS+= zmod_subr.c
65SRCS+= zutil.c
66
37.if exists(${_A}/${MACHINE_CPUARCH}/opensolaris_atomic.S)
38.PATH: ${_A}/${MACHINE_CPUARCH}
39SRCS+= opensolaris_atomic.S
40.elif exists(${_A}/${MACHINE_ARCH}/opensolaris_atomic.S)
41.PATH: ${_A}/${MACHINE_ARCH}
42SRCS+= opensolaris_atomic.S
43.else
44SRCS+= opensolaris_atomic.c

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

61SRCS+= inffast.c
62SRCS+= inflate.c
63SRCS+= inftrees.c
64SRCS+= trees.c
65SRCS+= zmod.c
66SRCS+= zmod_subr.c
67SRCS+= zutil.c
68
67.PATH: ${.CURDIR}/../../crypto/sha2
69.PATH: ${SYSDIR}/crypto/sha2
68SRCS+= sha2.c sha256c.c
69
70.PATH: ${SUNW}/common/zfs
71.include "${SUNW}/uts/common/Makefile.files"
72.PATH: ${SUNW}/uts/common/fs/zfs
73ZFS_SRCS= ${ZFS_OBJS:C/.o$/.c/}
74SRCS+= ${ZFS_SRCS}
75SRCS+= vdev_geom.c
76SRCS+= trim_map.c
77
78# Use FreeBSD's namecache.
79CFLAGS+=-DFREEBSD_NAMECACHE
80
70SRCS+= sha2.c sha256c.c
71
72.PATH: ${SUNW}/common/zfs
73.include "${SUNW}/uts/common/Makefile.files"
74.PATH: ${SUNW}/uts/common/fs/zfs
75ZFS_SRCS= ${ZFS_OBJS:C/.o$/.c/}
76SRCS+= ${ZFS_SRCS}
77SRCS+= vdev_geom.c
78SRCS+= trim_map.c
79
80# Use FreeBSD's namecache.
81CFLAGS+=-DFREEBSD_NAMECACHE
82
81CFLAGS+=-I${.CURDIR}/../../cddl/compat/opensolaris
83CFLAGS+=-I${SYSDIR}/cddl/compat/opensolaris
82CFLAGS+=-I${SUNW}/uts/common/fs/zfs
83CFLAGS+=-I${SUNW}/uts/common/zmod
84CFLAGS+=-I${SUNW}/uts/common
84CFLAGS+=-I${SUNW}/uts/common/fs/zfs
85CFLAGS+=-I${SUNW}/uts/common/zmod
86CFLAGS+=-I${SUNW}/uts/common
85CFLAGS+=-I${.CURDIR}/../..
87CFLAGS+=-I${SYSDIR}
86CFLAGS+=-I${SUNW}/common/zfs
87CFLAGS+=-I${SUNW}/common
88CFLAGS+=-DBUILDING_ZFS
89
90.if ${MACHINE_ARCH} == "powerpc64"
91CFLAGS+=-mminimal-toc
92.endif
93
94#CFLAGS+=-DDEBUG=1
95#DEBUG_FLAGS=-g
96
97.include <bsd.kmod.mk>
98
88CFLAGS+=-I${SUNW}/common/zfs
89CFLAGS+=-I${SUNW}/common
90CFLAGS+=-DBUILDING_ZFS
91
92.if ${MACHINE_ARCH} == "powerpc64"
93CFLAGS+=-mminimal-toc
94.endif
95
96#CFLAGS+=-DDEBUG=1
97#DEBUG_FLAGS=-g
98
99.include <bsd.kmod.mk>
100
99CFLAGS+= -include ${.CURDIR}/../../cddl/compat/opensolaris/sys/debug_compat.h
101CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h
100
101CWARNFLAGS+=-Wno-unknown-pragmas
102CWARNFLAGS+=-Wno-missing-prototypes
103CWARNFLAGS+=-Wno-undef
104CWARNFLAGS+=-Wno-strict-prototypes
105CWARNFLAGS+=-Wno-cast-qual
106CWARNFLAGS+=-Wno-parentheses
107CWARNFLAGS+=-Wno-redundant-decls
108CWARNFLAGS+=-Wno-missing-braces
109CWARNFLAGS+=-Wno-uninitialized
110CWARNFLAGS+=-Wno-unused
111CWARNFLAGS+=-Wno-inline
112CWARNFLAGS+=-Wno-switch
113CWARNFLAGS+=-Wno-pointer-arith
102
103CWARNFLAGS+=-Wno-unknown-pragmas
104CWARNFLAGS+=-Wno-missing-prototypes
105CWARNFLAGS+=-Wno-undef
106CWARNFLAGS+=-Wno-strict-prototypes
107CWARNFLAGS+=-Wno-cast-qual
108CWARNFLAGS+=-Wno-parentheses
109CWARNFLAGS+=-Wno-redundant-decls
110CWARNFLAGS+=-Wno-missing-braces
111CWARNFLAGS+=-Wno-uninitialized
112CWARNFLAGS+=-Wno-unused
113CWARNFLAGS+=-Wno-inline
114CWARNFLAGS+=-Wno-switch
115CWARNFLAGS+=-Wno-pointer-arith