Print this page
2619 asynchronous destruction of ZFS file systems
2747 SPA versioning with zfs feature flags
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <gwilson@delphix.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/lib/libzfs/Makefile.com
+++ new/usr/src/lib/libzfs/Makefile.com
1 1 #
2 2 # CDDL HEADER START
3 3 #
4 4 # The contents of this file are subject to the terms of the
5 5 # Common Development and Distribution License (the "License").
6 6 # You may not use this file except in compliance with the License.
7 7 #
8 8 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 # or http://www.opensolaris.org/os/licensing.
10 10 # See the License for the specific language governing permissions
11 11 # and limitations under the License.
12 12 #
|
↓ open down ↓ |
12 lines elided |
↑ open up ↑ |
13 13 # When distributing Covered Code, include this CDDL HEADER in each
14 14 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 # If applicable, add the following below this CDDL HEADER, with the
16 16 # fields enclosed by brackets "[]" replaced with your own identifying
17 17 # information: Portions Copyright [yyyy] [name of copyright owner]
18 18 #
19 19 # CDDL HEADER END
20 20 #
21 21 #
22 22 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
23 -# Copyright (c) 2011 by Delphix. All rights reserved.
23 +# Copyright (c) 2012 by Delphix. All rights reserved.
24 24 #
25 25
26 26 LIBRARY= libzfs.a
27 27 VERS= .1
28 28
29 29 OBJS_SHARED= \
30 + zfeature_common.o \
30 31 zfs_comutil.o \
31 32 zfs_deleg.o \
32 33 zfs_fletcher.o \
33 34 zfs_namecheck.o \
34 35 zfs_prop.o \
35 36 zpool_prop.o \
36 37 zprop_common.o
37 38
38 39 OBJS_COMMON= \
39 40 libzfs_changelist.o \
40 41 libzfs_config.o \
41 42 libzfs_dataset.o \
42 43 libzfs_diff.o \
43 44 libzfs_fru.o \
44 45 libzfs_import.o \
45 46 libzfs_iter.o \
46 47 libzfs_mount.o \
47 48 libzfs_pool.o \
48 49 libzfs_sendrecv.o \
49 50 libzfs_status.o \
50 51 libzfs_util.o
51 52
52 53 OBJECTS= $(OBJS_COMMON) $(OBJS_SHARED)
53 54
54 55 include ../../Makefile.lib
55 56
56 57 # libzfs must be installed in the root filesystem for mount(1M)
57 58 include ../../Makefile.rootfs
58 59
59 60 LIBS= $(DYNLIB) $(LINTLIB)
60 61
61 62 SRCDIR = ../common
62 63
63 64 INCS += -I$(SRCDIR)
64 65 INCS += -I../../../uts/common/fs/zfs
65 66 INCS += -I../../../common/zfs
66 67 INCS += -I../../libc/inc
67 68
68 69 C99MODE= -xc99=%all
69 70 C99LMODE= -Xc99=%all
70 71 LDLIBS += -lc -lm -ldevid -lgen -lnvpair -luutil -lavl -lefi \
71 72 -ladm -lidmap -ltsol -lmd -lumem
72 73 CPPFLAGS += $(INCS) -D_LARGEFILE64_SOURCE=1 -D_REENTRANT
73 74
74 75 SRCS= $(OBJS_COMMON:%.o=$(SRCDIR)/%.c) \
75 76 $(OBJS_SHARED:%.o=$(SRC)/common/zfs/%.c)
76 77 $(LINTLIB) := SRCS= $(SRCDIR)/$(LINTSRC)
77 78
78 79 .KEEP_STATE:
79 80
80 81 all: $(LIBS)
81 82
82 83 lint: lintcheck
83 84
84 85 pics/%.o: ../../../common/zfs/%.c
85 86 $(COMPILE.c) -o $@ $<
86 87 $(POST_PROCESS_O)
87 88
88 89 include ../../Makefile.targ
|
↓ open down ↓ |
49 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX